Merge branch 'for-upstream/platform-x86_tpacpi' of git://repo.or.cz/linux-2.6/linux...

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / platform / x86 / Kconfig

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 11fce79..92161c7 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -59,6 +59,8 @@ config ASUS_LAPTOP
        select NEW_LEDS
        select BACKLIGHT_CLASS_DEVICE
        depends on INPUT
+       depends on RFKILL || RFKILL = n
+       select INPUT_SPARSEKMAP
        ---help---
          This is the new Linux driver for Asus laptops. It may also support some
          MEDION, JVC or VICTOR laptops. It makes all the extra buttons generate
@@ -79,6 +81,7 @@ config DELL_LAPTOP
        depends on BACKLIGHT_CLASS_DEVICE
        depends on RFKILL || RFKILL = n
        depends on POWER_SUPPLY
+       depends on SERIO_I8042
        default n
        ---help---
        This driver adds support for rfkill and backlight control to Dell