patch-2.4.22 linux-2.4.22/arch/i386/config.in
Next file: linux-2.4.22/arch/i386/kernel/Makefile
Previous file: linux-2.4.22/arch/i386/boot/compressed/misc.c
Back to the patch index
Back to the overall index
- Lines: 39
- Date:
2003-08-25 04:44:39.000000000 -0700
- Orig file:
linux-2.4.21/arch/i386/config.in
- Orig date:
2003-06-13 07:51:29.000000000 -0700
diff -urN linux-2.4.21/arch/i386/config.in linux-2.4.22/arch/i386/config.in
@@ -326,14 +326,6 @@
bool 'Power Management support' CONFIG_PM
-if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
- dep_bool ' ACPI support' CONFIG_ACPI $CONFIG_PM
-
- if [ "$CONFIG_ACPI" != "n" ]; then
- source drivers/acpi/Config.in
- fi
-fi
-
dep_tristate ' Advanced Power Management BIOS support' CONFIG_APM $CONFIG_PM
if [ "$CONFIG_APM" != "n" ]; then
bool ' Ignore USER SUSPEND' CONFIG_APM_IGNORE_USER_SUSPEND
@@ -345,6 +337,8 @@
bool ' Use real mode APM BIOS call to power off' CONFIG_APM_REAL_MODE_POWER_OFF
fi
+source drivers/acpi/Config.in
+
endmenu
source drivers/mtd/Config.in
@@ -399,7 +393,7 @@
bool 'Network device support' CONFIG_NETDEVICES
if [ "$CONFIG_NETDEVICES" = "y" ]; then
source drivers/net/Config.in
- if [ "$CONFIG_ATM" = "y" ]; then
+ if [ "$CONFIG_ATM" = "y" -o "$CONFIG_ATM" = "m" ]; then
source drivers/atm/Config.in
fi
fi
@@ -484,4 +478,5 @@
endmenu
+source crypto/Config.in
source lib/Config.in
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)