diff --git a/[refs] b/[refs] index ae976d9e5387..e60d91d2f59e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d8e7aa6e5c21e14843404c5e4c04d4cf043e40e +refs/heads/master: 0a47c906342e2447003e207d23917dfa5c912071 diff --git a/trunk/drivers/acpi/Kconfig b/trunk/drivers/acpi/Kconfig index fe1e8126fbae..fce21c257523 100644 --- a/trunk/drivers/acpi/Kconfig +++ b/trunk/drivers/acpi/Kconfig @@ -197,7 +197,6 @@ config ACPI_ASUS config ACPI_IBM tristate "IBM ThinkPad Laptop Extras" depends on X86 - default y ---help--- This is a Linux ACPI driver for the IBM ThinkPad laptops. It adds support for Fn-Fx key combinations, Bluetooth control, video