patch-2.4.21 linux-2.4.21/arch/alpha/config.in
Next file: linux-2.4.21/arch/alpha/defconfig
Previous file: linux-2.4.21/REPORTING-BUGS
Back to the patch index
Back to the overall index
- Lines: 95
- Date:
2003-06-13 07:51:29.000000000 -0700
- Orig file:
linux-2.4.20/arch/alpha/config.in
- Orig date:
2002-11-28 15:53:08.000000000 -0800
diff -urN linux-2.4.20/arch/alpha/config.in linux-2.4.21/arch/alpha/config.in
@@ -42,6 +42,7 @@
Eiger CONFIG_ALPHA_EIGER \
Jensen CONFIG_ALPHA_JENSEN \
LX164 CONFIG_ALPHA_LX164 \
+ Marvel CONFIG_ALPHA_MARVEL \
Miata CONFIG_ALPHA_MIATA \
Mikasa CONFIG_ALPHA_MIKASA \
Nautilus CONFIG_ALPHA_NAUTILUS \
@@ -181,6 +182,12 @@
define_bool CONFIG_ALPHA_EV6 y
define_bool CONFIG_ALPHA_EV67 y
fi
+if [ "$CONFIG_ALPHA_MARVEL" = "y" ]
+then
+ define_bool CONFIG_ALPHA_EV6 y
+ define_bool CONFIG_ALPHA_EV67 y
+ define_bool CONFIG_ALPHA_EV7 y
+fi
if [ "$CONFIG_ALPHA_RAWHIDE" = "y" ]
then
define_bool CONFIG_ALPHA_EV5 y
@@ -208,7 +215,8 @@
-o "$CONFIG_ALPHA_SABLE" = "y" -o "$CONFIG_ALPHA_NORITAKE" = "y" \
-o "$CONFIG_ALPHA_DP264" = "y" -o "$CONFIG_ALPHA_RAWHIDE" = "y" \
-o "$CONFIG_ALPHA_EIGER" = "y" -o "$CONFIG_ALPHA_WILDFIRE" = "y" \
- -o "$CONFIG_ALPHA_TITAN" = "y" -o "$CONFIG_ALPHA_SHARK" = "y" ]
+ -o "$CONFIG_ALPHA_TITAN" = "y" -o "$CONFIG_ALPHA_SHARK" = "y" \
+ -o "$CONFIG_ALPHA_MARVEL" = "y" ]
then
define_bool CONFIG_ALPHA_SRM y
fi
@@ -222,6 +230,8 @@
bool 'Use SRM as bootloader' CONFIG_ALPHA_SRM
fi
+bool 'Verbose Machine Checks' CONFIG_VERBOSE_MCHECK
+
if [ "$CONFIG_ALPHA_ALCOR" = "y" -o "$CONFIG_ALPHA_MIKASA" = "y" \
-o "$CONFIG_ALPHA_SABLE" = "y" -o "$CONFIG_ALPHA_NORITAKE" = "y" \
-o "$CONFIG_ALPHA_RAWHIDE" = "y" ]
@@ -240,7 +250,7 @@
if [ "$CONFIG_ALPHA_SABLE" = "y" -o "$CONFIG_ALPHA_RAWHIDE" = "y" \
-o "$CONFIG_ALPHA_DP264" = "y" -o "$CONFIG_ALPHA_WILDFIRE" = "y" \
-o "$CONFIG_ALPHA_TITAN" = "y" -o "$CONFIG_ALPHA_GENERIC" = "y" \
- -o "$CONFIG_ALPHA_SHARK" = "y" ]
+ -o "$CONFIG_ALPHA_SHARK" = "y" -o "$CONFIG_ALPHA_MARVEL" = "y" ]
then
bool 'Symmetric multi-processing support' CONFIG_SMP
fi
@@ -249,6 +259,10 @@
define_bool CONFIG_HAVE_DEC_LOCK y
fi
+if [ "$CONFIG_ALPHA_GENERIC" = "y" -o "$CONFIG_ALPHA_SRM" = "y" ]; then
+ define_bool CONFIG_EARLY_PRINTK y
+fi
+
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
bool 'Discontiguous Memory Support (EXPERIMENTAL)' CONFIG_DISCONTIGMEM
if [ "$CONFIG_DISCONTIGMEM" = "y" ]; then
@@ -311,6 +325,7 @@
tristate 'ATA/IDE/MFM/RLL support' CONFIG_IDE
if [ "$CONFIG_IDE" != "n" ]; then
+ int ' Maximum IDE interfaces' MAX_HWIFS 4
source drivers/ide/Config.in
else
define_bool CONFIG_BLK_DEV_IDE_MODES n
@@ -330,6 +345,7 @@
if [ "$CONFIG_PCI" = "y" ]; then
source drivers/message/fusion/Config.in
+ source drivers/ieee1394/Config.in
fi
if [ "$CONFIG_NET" = "y" ]; then
@@ -366,6 +382,10 @@
fi
endmenu
+#
+# input before char - char/joystick depends on it. As does USB.
+#
+source drivers/input/Config.in
source drivers/char/Config.in
#source drivers/misc/Config.in
@@ -401,7 +421,6 @@
endmenu
source drivers/usb/Config.in
-source drivers/input/Config.in
source net/bluetooth/Config.in
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)