From 05d14ec7a6f06112bbe68af74e3cf88e6d2c6449 Mon Sep 17 00:00:00 2001
From: Michal Marek <mmarek@suse.cz>
Date: Sat, 12 Jun 2010 00:01:31 +0200
Subject: [PATCH] --- yaml --- r: 204875 b: refs/heads/master c:
 6ff21517c001f38b02393ad9dc92decbaee209fa h: refs/heads/master i:   204873:
 e1b9741211292e540a0ef138e0a8b29ba1dbb35c   204871:
 59f086806cfe48506eeab48aa709300f15540161 v: v3

---
 [refs]                               |  2 +-
 trunk/Makefile                       |  2 +-
 trunk/scripts/checkkconfigsymbols.sh |  2 +-
 trunk/scripts/decodecode             | 10 +++++-----
 trunk/scripts/kconfig/.gitignore     |  1 +
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index ab1c5ae46951..5cfb58d90a89 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82c4340b0a3ccf090ef38fa111363018cf0594c8
+refs/heads/master: 6ff21517c001f38b02393ad9dc92decbaee209fa
diff --git a/trunk/Makefile b/trunk/Makefile
index 5a4bf98e83a5..8acf7edad82c 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -526,7 +526,7 @@ endif # $(dot-config)
 # The all: target is the default when no target is given on the
 # command line.
 # This allow a user to issue only 'make' to build a kernel including modules
-# Defaults vmlinux but it is usually overridden in the arch makefile
+# Defaults to vmlinux, but the arch makefile usually adds further targets
 all: vmlinux
 
 ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
diff --git a/trunk/scripts/checkkconfigsymbols.sh b/trunk/scripts/checkkconfigsymbols.sh
index 46be3c5a62b7..2ca49bb31efc 100755
--- a/trunk/scripts/checkkconfigsymbols.sh
+++ b/trunk/scripts/checkkconfigsymbols.sh
@@ -14,7 +14,7 @@ find $paths -name '*.[chS]' -o -name 'Makefile' -o -name 'Makefile*[^~]'| while
 do
 	# Output the bare Kconfig variable and the filename; the _MODULE part at
 	# the end is not removed here (would need perl an not-hungry regexp for that).
-	sed -ne 's!^.*\<\(UML_\)\?CONFIG_\([0-9A-Z_]\+\).*!\2 '$i'!p' < $i
+	sed -ne 's!^.*\<\(UML_\)\?CONFIG_\([0-9A-Za-z_]\+\).*!\2 '$i'!p' < $i
 done | \
 # Smart "sort|uniq" implemented in awk and tuned to collect the names of all
 # files which use a given symbol
diff --git a/trunk/scripts/decodecode b/trunk/scripts/decodecode
index 8b30cc36744f..18ba881c3415 100755
--- a/trunk/scripts/decodecode
+++ b/trunk/scripts/decodecode
@@ -40,7 +40,7 @@ echo $code
 code=`echo $code | sed -e 's/.*Code: //'`
 
 width=`expr index "$code" ' '`
-width=$[($width-1)/2]
+width=$((($width-1)/2))
 case $width in
 1) type=byte ;;
 2) type=2byte ;;
@@ -48,10 +48,10 @@ case $width in
 esac
 
 disas() {
-	${CROSS_COMPILE}as $AFLAGS -o $1.o $1.s &> /dev/null
+	${CROSS_COMPILE}as $AFLAGS -o $1.o $1.s > /dev/null 2>&1
 
-	if [ "$ARCH" == "arm" ]; then
-		if [ $width == 2 ]; then
+	if [ "$ARCH" = "arm" ]; then
+		if [ $width -eq 2 ]; then
 			OBJDUMPFLAGS="-M force-thumb"
 		fi
 
@@ -59,7 +59,7 @@ disas() {
 	fi
 
 	${CROSS_COMPILE}objdump $OBJDUMPFLAGS -S $1.o | \
-		grep -v "/tmp\|Disassembly\|\.text\|^$" &> $1.dis
+		grep -v "/tmp\|Disassembly\|\.text\|^$" > $1.dis 2>&1
 }
 
 marker=`expr index "$code" "\<"`
diff --git a/trunk/scripts/kconfig/.gitignore b/trunk/scripts/kconfig/.gitignore
index 6a36a76e6606..624f6502e03e 100644
--- a/trunk/scripts/kconfig/.gitignore
+++ b/trunk/scripts/kconfig/.gitignore
@@ -17,6 +17,7 @@ gconf.glade.h
 #
 conf
 mconf
+nconf
 qconf
 gconf
 kxgettext