diff --git a/[refs] b/[refs] index c52d9f475b5c..0717b82c8184 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9920e91450ee9b373dd4924f79d287a267b8f6a3 +refs/heads/master: 3e11c3ce0a4ce3d30802babccb0e5f881778ccf1 diff --git a/trunk/drivers/acpi/Kconfig b/trunk/drivers/acpi/Kconfig index 0400a52d5085..670fdb5142d1 100644 --- a/trunk/drivers/acpi/Kconfig +++ b/trunk/drivers/acpi/Kconfig @@ -40,13 +40,12 @@ config ACPI available at: +if ACPI + config ACPI_BOOT bool - depends on ACPI || X86_HT default y -if ACPI - config ACPI_INTERPRETER bool depends on !IA64_SGI_SN