Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 353640
b: refs/heads/master
c: f756f28
h: refs/heads/master
v: v3
  • Loading branch information
Kees Cook authored and Greg Kroah-Hartman committed Jan 21, 2013
1 parent 39dcc23 commit 4bda711
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: aa8820cc3b6e2ce67b1ec320d02e9ce0f72275ea
refs/heads/master: f756f28b84af5faa4dcb70ef10c6350b6ce081be
9 changes: 3 additions & 6 deletions trunk/drivers/acpi/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@ config ACPI_FAN

config ACPI_DOCK
bool "Dock"
depends on EXPERIMENTAL
help
This driver supports ACPI-controlled docking stations and removable
drive bays such as the IBM Ultrabay and the Dell Module Bay.
Expand All @@ -202,7 +201,7 @@ config ACPI_PROCESSOR
the module will be called processor.
config ACPI_IPMI
tristate "IPMI"
depends on EXPERIMENTAL && IPMI_SI && IPMI_HANDLER
depends on IPMI_SI && IPMI_HANDLER
default n
help
This driver enables the ACPI to access the BMC controller. And it
Expand All @@ -214,14 +213,13 @@ config ACPI_IPMI

config ACPI_HOTPLUG_CPU
bool
depends on EXPERIMENTAL && ACPI_PROCESSOR && HOTPLUG_CPU
depends on ACPI_PROCESSOR && HOTPLUG_CPU
select ACPI_CONTAINER
default y

config ACPI_PROCESSOR_AGGREGATOR
tristate "Processor Aggregator"
depends on ACPI_PROCESSOR
depends on EXPERIMENTAL
depends on X86
help
ACPI 4.0 defines processor Aggregator, which enables OS to perform
Expand Down Expand Up @@ -337,8 +335,7 @@ config X86_PM_TIMER
systems require this timer.

config ACPI_CONTAINER
tristate "Container and Module Devices (EXPERIMENTAL)"
depends on EXPERIMENTAL
tristate "Container and Module Devices"
default (ACPI_HOTPLUG_MEMORY || ACPI_HOTPLUG_CPU || ACPI_HOTPLUG_IO)
help
This driver supports ACPI Container and Module devices (IDs
Expand Down

0 comments on commit 4bda711

Please sign in to comment.