patch-2.1.116 linux/arch/alpha/config.in

Next file: linux/arch/alpha/defconfig
Previous file: linux/arch/alpha/Makefile
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.115/linux/arch/alpha/config.in linux/arch/alpha/config.in
@@ -31,30 +31,30 @@
 fi
 
 choice 'Alpha system type' \
-	"Avanti		CONFIG_ALPHA_AVANTI		\
-	 Alpha-XL	CONFIG_ALPHA_XL			\
-	 Alpha-XLT	CONFIG_ALPHA_XLT		\
-	 Cabriolet	CONFIG_ALPHA_CABRIOLET		\
-	 EB66		CONFIG_ALPHA_EB66		\
-	 EB66+		CONFIG_ALPHA_EB66P		\
-	 EB64+		CONFIG_ALPHA_EB64P		\
-	 EB164		CONFIG_ALPHA_EB164		\
-	 PC164		CONFIG_ALPHA_PC164		\
-	 LX164		CONFIG_ALPHA_LX164		\
-	 SX164		CONFIG_ALPHA_SX164		\
-	 DP264		CONFIG_ALPHA_DP264		\
-	 Jensen		CONFIG_ALPHA_JENSEN		\
-	 Noname		CONFIG_ALPHA_NONAME		\
-	 Takara		CONFIG_ALPHA_TAKARA		\
-	 Mikasa		CONFIG_ALPHA_MIKASA		\
-	 Noritake	CONFIG_ALPHA_NORITAKE		\
-	 Alcor		CONFIG_ALPHA_ALCOR		\
-	 Miata		CONFIG_ALPHA_MIATA		\
-	 Sable		CONFIG_ALPHA_SABLE		\
-	 Rawhide	CONFIG_ALPHA_RAWHIDE		\
-	 AlphaBook1	CONFIG_ALPHA_BOOK1		\
-	 Ruffian	CONFIG_ALPHA_RUFFIAN		\
-	 Platform2000	CONFIG_ALPHA_P2K" Cabriolet
+	"Generic		CONFIG_ALPHA_GENERIC		\
+	 Alcor/Alpha-XLT	CONFIG_ALPHA_ALCOR		\
+	 Alpha-XL		CONFIG_ALPHA_XL			\
+	 AlphaBook1		CONFIG_ALPHA_BOOK1		\
+	 Avanti			CONFIG_ALPHA_AVANTI		\
+	 Cabriolet		CONFIG_ALPHA_CABRIOLET		\
+	 DP264			CONFIG_ALPHA_DP264		\
+	 EB164			CONFIG_ALPHA_EB164		\
+	 EB64+			CONFIG_ALPHA_EB64P		\
+	 EB66			CONFIG_ALPHA_EB66		\
+	 EB66+			CONFIG_ALPHA_EB66P		\
+	 Jensen			CONFIG_ALPHA_JENSEN		\
+	 LX164			CONFIG_ALPHA_LX164		\
+	 Miata			CONFIG_ALPHA_MIATA		\
+	 Mikasa			CONFIG_ALPHA_MIKASA		\
+	 Noname			CONFIG_ALPHA_NONAME		\
+	 Noritake		CONFIG_ALPHA_NORITAKE		\
+	 PC164			CONFIG_ALPHA_PC164		\
+	 Platform2000		CONFIG_ALPHA_P2K		\
+	 Rawhide		CONFIG_ALPHA_RAWHIDE		\
+	 Ruffian		CONFIG_ALPHA_RUFFIAN		\
+	 SX164			CONFIG_ALPHA_SX164		\
+	 Sable			CONFIG_ALPHA_SABLE		\
+	 Takara			CONFIG_ALPHA_TAKARA" Generic
 
 # clear all implied options (don't want default values for those):
 unset CONFIG_ALPHA_EV4 CONFIG_ALPHA_EV5 CONFIG_ALPHA_EV6
@@ -64,6 +64,11 @@
 unset CONFIG_ALPHA_TSUNAMI CONFIG_ALPHA_MCPCIA
 unset CONFIG_ALPHA_NEED_ROUNDING_EMULATION
 
+if [ "$CONFIG_ALPHA_GENERIC" = "y" ]
+then
+	define_bool CONFIG_PCI y
+	define_bool CONFIG_ALPHA_NEED_ROUNDING_EMULATION y
+fi
 if [ "$CONFIG_ALPHA_BOOK1" = "y" ]
 then
 	define_bool CONFIG_ALPHA_NONAME y

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov