ChangeSet 1.2065.4.3, 2005/03/12 22:28:05+01:00, [EMAIL PROTECTED]
kconfig/acpi: Cleanup Kconfig
Simplify dependencies.
Signed-off-by: Roman Zippel <[EMAIL PROTECTED]>
Signed-off-by: Sam Ravnborg <[EMAIL PROTECTED]>
Kconfig | 34 ++++++++++++----------------------
1 files changed, 12 insertions(+), 22 deletions(-)
diff -Nru a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
--- a/drivers/acpi/Kconfig 2005-03-13 09:07:54 -08:00
+++ b/drivers/acpi/Kconfig 2005-03-13 09:07:54 -08:00
@@ -45,16 +45,18 @@
depends on ACPI || X86_HT
default y
+if ACPI
+
config ACPI_INTERPRETER
bool
- depends on ACPI
depends on !IA64_SGI_SN
default y
+if ACPI_INTERPRETER
+
config ACPI_SLEEP
bool "Sleep States (EXPERIMENTAL)"
- depends on X86 && ACPI
- depends on ACPI_INTERPRETER
+ depends on X86
depends on EXPERIMENTAL && PM
default y
---help---
@@ -81,7 +83,6 @@
config ACPI_AC
tristate "AC Adapter"
depends on X86
- depends on ACPI_INTERPRETER
default m
help
This driver adds support for the AC Adapter object, which indicates
@@ -91,7 +92,6 @@
config ACPI_BATTERY
tristate "Battery"
depends on X86
- depends on ACPI_INTERPRETER
default m
help
This driver adds support for battery information through
@@ -100,7 +100,6 @@
config ACPI_BUTTON
tristate "Button"
- depends on ACPI_INTERPRETER
depends on !IA64_SGI_SN
default m
help
@@ -112,7 +111,6 @@
config ACPI_VIDEO
tristate "Video"
- depends on ACPI_INTERPRETER
depends on EXPERIMENTAL
depends on !IA64_SGI_SN
default m
@@ -127,7 +125,6 @@
config ACPI_FAN
tristate "Fan"
- depends on ACPI_INTERPRETER
depends on !IA64_SGI_SN
default m
help
@@ -136,7 +133,6 @@
config ACPI_PROCESSOR
tristate "Processor"
- depends on ACPI_INTERPRETER
depends on !IA64_SGI_SN
default m
help
@@ -165,7 +161,6 @@
config ACPI_NUMA
bool "NUMA support"
- depends on ACPI_INTERPRETER
depends on NUMA
depends on (IA64 || X86_64)
default y if IA64_GENERIC || IA64_SGI_SN2
@@ -173,7 +168,6 @@
config ACPI_ASUS
tristate "ASUS/Medion Laptop Extras"
depends on X86
- depends on ACPI_INTERPRETER
default m
---help---
This driver provides support for extra features of ACPI-compatible
@@ -203,7 +197,6 @@
config ACPI_IBM
tristate "IBM ThinkPad Laptop Extras"
depends on X86
- depends on ACPI_INTERPRETER
default m
---help---
This is a Linux ACPI driver for the IBM ThinkPad laptops. It adds
@@ -217,7 +210,6 @@
config ACPI_TOSHIBA
tristate "Toshiba Laptop Extras"
depends on X86
- depends on ACPI_INTERPRETER
default m
---help---
This driver adds support for access to certain system settings
@@ -244,7 +236,7 @@
config ACPI_CUSTOM_DSDT
bool "Include Custom DSDT"
- depends on ACPI_INTERPRETER && !STANDALONE
+ depends on !STANDALONE
default n
help
Thist option is to load a custom ACPI DSDT
@@ -271,7 +263,6 @@
config ACPI_DEBUG
bool "Debug Statements"
- depends on ACPI_INTERPRETER
depends on !IA64_SGI_SN
default n
help
@@ -281,14 +272,12 @@
config ACPI_BUS
bool
- depends on ACPI_INTERPRETER
depends on !IA64_SGI_SN
default y
config ACPI_EC
bool
depends on X86
- depends on ACPI_INTERPRETER
default y
help
This driver is required on some systems for the proper operation of
@@ -297,28 +286,27 @@
config ACPI_POWER
bool
- depends on ACPI_INTERPRETER
depends on !IA64_SGI_SN
default y
config ACPI_PCI
bool
- depends on ACPI_INTERPRETER
depends on !IA64_SGI_SN
default PCI
config ACPI_SYSTEM
bool
- depends on ACPI_INTERPRETER
depends on !IA64_SGI_SN
default y
help
This driver will enable your system to shut down using ACPI, and
dump your ACPI DSDT table using /proc/acpi/dsdt.
+endif # ACPI_INTERPRETER
+
config X86_PM_TIMER
bool "Power Management Timer Support"
- depends on X86 && ACPI
+ depends on X86
depends on ACPI_BOOT && EXPERIMENTAL
depends on !X86_64
default n
@@ -337,10 +325,12 @@
config ACPI_CONTAINER
tristate "ACPI0004,PNP0A05 and PNP0A06 Container Driver (EXPERIMENTAL)"
- depends on ACPI && EXPERIMENTAL
+ depends on EXPERIMENTAL
default (ACPI_HOTPLUG_MEMORY || ACPI_HOTPLUG_CPU || ACPI_HOTPLUG_IO)
---help---
This is the ACPI generic container driver which supports
ACPI0004, PNP0A05 and PNP0A06 devices
+
+endif # ACPI
endmenu
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
