Merge suse.cz:/home/vojtech/bk/linus into suse.cz:/home/vojtech/bk/input

498dc468 · Vojtech Pavlik · fab16bc3 · 45250f9d · 498dc468 · 498dc468
Commit 498dc468 authored Aug 29, 2002 by Vojtech Pavlik
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

arch/alpha/config.in arch/alpha/config.in +1 -1

arch/mips/config.in arch/mips/config.in +2 -1

arch/mips64/config.in arch/mips64/config.in +2 -1

No files found.
--- a/arch/alpha/config.in
+++ b/arch/alpha/config.in
@@ -338,6 +338,7 @@ if [ "$CONFIG_CD_NO_IDESCSI" != "n" ]; then
 fi
 endmenu
+source drivers/input/Config.in
 source drivers/char/Config.in
 #source drivers/misc/Config.in
@@ -373,7 +374,6 @@ fi
 endmenu
 source drivers/usb/Config.in
-source drivers/input/Config.in
 source net/bluetooth/Config.in

--- a/arch/mips/config.in
+++ b/arch/mips/config.in
@@ -389,6 +389,8 @@ if [ "$CONFIG_CD_NO_IDESCSI" != "n" ]; then
 fi
 endmenu
+source drivers/input/Config.in
 source drivers/char/Config.in
 source drivers/media/Config.in
@@ -474,7 +476,6 @@ if [ "$CONFIG_SGI_IP22" = "y" ]; then
 fi
 source drivers/usb/Config.in
-source drivers/input/Config.in
 mainmenu_option next_comment
 comment 'Kernel hacking'

--- a/arch/mips64/config.in
+++ b/arch/mips64/config.in
@@ -189,6 +189,8 @@ if [ "$CONFIG_CD_NO_IDESCSI" != "n" ]; then
 fi
 endmenu
+source drivers/input/Config.in
 source drivers/char/Config.in
 #source drivers/misc/Config.in
@@ -230,7 +232,6 @@ if [ "$CONFIG_SGI_IP22" = "y" ]; then
 fi
 source drivers/usb/Config.in
-source drivers/input/Config.in
 mainmenu_option next_comment
 comment 'Kernel hacking'