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

• Lines: 30
• Date: Mon Jul 2 14:34:57 2001
• Orig file: v2.4.5/linux/arch/ppc/config.in
• Orig date: Tue May 22 10:23:16 2001

diff -u --recursive --new-file v2.4.5/linux/arch/ppc/config.in linux/arch/ppc/config.in
@@ -1,4 +1,4 @@
-# BK Id: SCCS/s.config.in 1.24 05/21/01 00:48:24 cort
+# BK Id: SCCS/s.config.in 1.30 06/27/01 14:49:58 trini
 #
 # For a description of the syntax of this configuration file,
 # see Documentation/kbuild/config-language.txt.
@@ -84,9 +84,9 @@
 
 if [ "$CONFIG_6xx" = "y" -a "$CONFIG_8260" = "n" ]; then
   choice 'Machine Type'		\
-	"PowerMac/PReP/MTX/CHRP	CONFIG_ALL_PPC	\
-	 Gemini         CONFIG_GEMINI           \
-	 APUS		CONFIG_APUS"		PowerMac/PReP/MTX/CHRP
+	"CHRP/PowerMac/PReP	CONFIG_ALL_PPC		\
+  	 Amgia-APUS		CONFIG_APUS		\
+	 Synergy-Gemini        	CONFIG_GEMINI"		CHRP/PowerMac/PReP
 fi
 
 if [ "$CONFIG_PPC64BRIDGE" != "y" ]; then
@@ -364,6 +364,10 @@
 fi
 
 source drivers/usb/Config.in
+
+if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+   source net/bluetooth/Config.in
+fi
 
 mainmenu_option next_comment
 comment 'Kernel hacking'