patch-2.2.19 linux/arch/ppc/config.in

• Lines: 48
• Date: Sun Mar 25 11:37:30 2001
• Orig file: v2.2.18/arch/ppc/config.in
• Orig date: Sun Mar 25 11:28:18 2001

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.18/arch/ppc/config.in linux/arch/ppc/config.in
@@ -151,9 +151,11 @@
 mainmenu_option next_comment
 comment 'ISDN subsystem'
 
-tristate 'ISDN support' CONFIG_ISDN
-if [ "$CONFIG_ISDN" != "n" ]; then
-  source drivers/isdn/Config.in
+if [ "$CONFIG_NET" != "n" ]; then
+   tristate 'ISDN support' CONFIG_ISDN
+   if [ "$CONFIG_ISDN" != "n" ]; then
+      source drivers/isdn/Config.in
+   fi
 fi
 endmenu
 
@@ -176,22 +178,25 @@
 
 mainmenu_option next_comment
 comment 'Mac device drivers'
+
 if [ "$CONFIG_INPUT_KEYBDEV" = "y" -o "$CONFIG_INPUT_MOUSEDEV" = "y" ]; then
-   bool 'Use input layer for ADB keyboard and mouse' CONFIG_INPUT_ADBHID
+  bool 'Use input layer for ADB keyboard and mouse' CONFIG_INPUT_ADBHID
 fi
 if [ "$CONFIG_INPUT_ADBHID" = "y" ]; then
-   define_bool CONFIG_MAC_HID y
-   bool '  Support for ADB raw keycodes' CONFIG_MAC_ADBKEYCODES
-   bool '  Support for mouse button 2+3 emulation' CONFIG_MAC_EMUMOUSEBTN
+  define_bool CONFIG_INPUT_KEYBDEV $CONFIG_VT
+  define_bool CONFIG_INPUT_MOUSEDEV y
+  define_bool CONFIG_MAC_HID y
+  bool '  Support for ADB raw keycodes' CONFIG_MAC_ADBKEYCODES
+  bool '  Support for mouse button 2+3 emulation' CONFIG_MAC_EMUMOUSEBTN
 else
-   bool 'Support for ADB keyboard (old driver)' CONFIG_MAC_KEYBOARD
-   bool 'Support for ADB mouse (old driver)' CONFIG_ADBMOUSE
+  bool 'Support for ADB keyboard (old driver)' CONFIG_MAC_KEYBOARD
+  bool 'Support for ADB mouse (old driver)' CONFIG_ADBMOUSE
 fi
 tristate 'Support for /dev/rtc' CONFIG_PPC_RTC
 bool 'Support for PowerMac floppy' CONFIG_MAC_FLOPPY
 tristate 'Support for PowerMac serial ports' CONFIG_MAC_SERIAL
 if [ "$CONFIG_MAC_SERIAL" = "y" ]; then
-   bool '   Support for console on serial port' CONFIG_SERIAL_CONSOLE
+  bool '   Support for console on serial port' CONFIG_SERIAL_CONSOLE
 fi
 endmenu