diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-29 13:44:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-29 13:44:34 -0700 |
| commit | 358a9afc35d550db4f67b1c8336f5326244ceeda (patch) | |
| tree | f655236e34eb0a5d527dbd972600dd76305897df /drivers/hwmon/Kconfig | |
| parent | 55663219378eecd6fccb319be27ce6737a535e4c (diff) | |
| parent | 6996abf0962bb86b6285987a4698f6d275ff531f (diff) | |
| download | talos-obmc-linux-358a9afc35d550db4f67b1c8336f5326244ceeda.tar.gz talos-obmc-linux-358a9afc35d550db4f67b1c8336f5326244ceeda.zip | |
Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
hwmon/applesmc: Handle name file creation error and deletion
hwmon/applesmc: Simplify dependencies
hwmon-vid: Don't spam the logs when VRM version is missing
hwmon/w83627hf: Be quiet when no chip is found
hwmon/coretemp: Add more safety checks
hwmon/ds1621: Fix swapped temperature limits
Diffstat (limited to 'drivers/hwmon/Kconfig')
| -rw-r--r-- | drivers/hwmon/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index 4d1cb5b855d1..13eea47dceb3 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig @@ -620,7 +620,7 @@ config SENSORS_HDAPS config SENSORS_APPLESMC tristate "Apple SMC (Motion sensor, light sensor, keyboard backlight)" - depends on HWMON && INPUT && X86 + depends on INPUT && X86 select NEW_LEDS select LEDS_CLASS default n |
