Merge branch 'linus' into test

[linux-2.6-omap-h63xx.git] / drivers / misc / Kconfig

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 4ed83575393c3573169a4c2e1ade04429d94b59c..9494400e8fd0baea0723cb7ccf78d37535cd279e 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -15,7 +15,7 @@ if MISC_DEVICES
 
 config ATMEL_PWM
        tristate "Atmel AT32/AT91 PWM support"
-       depends on AVR32 || ARCH_AT91
+       depends on AVR32 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91CAP9
        help
          This option enables device driver support for the PWM channels
          on certain Atmel prcoessors.  Pulse Width Modulation is used for
@@ -145,6 +145,7 @@ config ACER_WMI
        depends on NEW_LEDS
        depends on BACKLIGHT_CLASS_DEVICE
        depends on SERIO_I8042
+       depends on RFKILL
        select ACPI_WMI
        ---help---
          This is a driver for newer Acer (and Wistron) laptops. It adds
@@ -247,7 +248,7 @@ config MSI_LAPTOP
 
 config PANASONIC_LAPTOP
        tristate "Panasonic Laptop Extras"
-       depends on X86 && INPUT
+       depends on X86 && INPUT && ACPI
         depends on BACKLIGHT_CLASS_DEVICE
        ---help---
          This driver adds support for access to backlight control and hotkeys
@@ -420,6 +421,7 @@ config EEEPC_LAPTOP
        depends on BACKLIGHT_CLASS_DEVICE
        depends on HWMON
        depends on EXPERIMENTAL
+       depends on RFKILL
        ---help---
          This driver supports the Fn-Fx keys on Eee PC laptops.
          It also adds the ability to switch camera/wlan on/off.