Merge with git+ssh://master.kernel.org/pub/scm/libs/klibc/klibc.git
diff --git a/README b/README
index eb72e1c..8a988f1 100644
--- a/README
+++ b/README
@@ -11,11 +11,22 @@
http://www.zytor.com/mailman/listinfo/klibc/
-There is also a cvsweb repository at:
+klibc is maintained in the git version control system. The git
+repository can be viewed on the web at:
- http://www.zytor.com/cvsweb.cgi/klibc/
+ http://www.kernel.org/git/?p=libs/klibc/klibc.git;a=summary
-There is no direct public CVS access yet, however, the CVS repository
-is available for rsync from:
+To clone the klibc repository using Cogito:
- rsync://rsync.kernel.org/pub/linux/libs/klibc/cvsroot/
+ git clone git://git.kernel.org/pub/scm/libs/klibc/klibc.git <workdir>
+
+To update an already cloned tree:
+
+ git pull
+
+For more information on git, see:
+
+ http://git.or.cz/
+ http://www.kernel.org/pub/software/scm/git/docs/tutorial.html
+ http://www.kernel.org/pub/software/scm/git/docs
+
diff --git a/klcc/klcc.in b/klcc/klcc.in
index a7bccd8..d4313a5 100644
--- a/klcc/klcc.in
+++ b/klcc/klcc.in
@@ -180,8 +180,12 @@
$strip = 1;
} elsif ( $a eq '-o' ) {
$output = shift(@ARGV);
- } elsif ( $a eq '-x' ) {
- $lang = shift(@ARGV);
+ } elsif ( $a =~ /^\-x(.*)$/ ) {
+ # -x can be conjoined or disjoined
+ $lang = $1;
+ if ( $lang eq '' ) {
+ $lang = shift(@ARGV);
+ }
} elsif ( $a eq '-nostdinc' ) {
push(@ccopt, $a);
@includes = ();
diff --git a/usr/kinit/resume/resumelib.c b/usr/kinit/resume/resumelib.c
index ce5c2b2..ba1e339 100644
--- a/usr/kinit/resume/resumelib.c
+++ b/usr/kinit/resume/resumelib.c
@@ -12,7 +12,6 @@
#include <limits.h>
#include <sys/stat.h>
#include <sys/sysmacros.h>
-#include <linux/config.h> /* For CONFIG_PM_STD_PARTITION */
#include "kinit.h"
#include "do_mounts.h"
