Merge branch 'core/debugobjects' into core/urgent

1 files changed, 21 insertions, 3 deletions

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 4b33bc82cc24..b84bf066879b 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -189,6 +189,16 @@ config SENSORS_ADT7473
           This driver can also be built as a module. If so, the module
           will be called adt7473.
 
+config SENSORS_ADT7475
+        tristate "Analog Devices ADT7475"
+        depends on I2C && EXPERIMENTAL
+        help
+          If you say yes here you get support for the Analog Devices
+          ADT7475 hardware monitoring chips.
+
+          This driver can also be build as a module.  If so, the module
+          will be called adt7475.
+
 config SENSORS_K8TEMP
         tristate "AMD Athlon64/FX or Opteron temperature sensor"
         depends on X86 && PCI && EXPERIMENTAL
@@ -861,6 +871,8 @@ config SENSORS_HDAPS
 config SENSORS_LIS3LV02D
         tristate "STMicroeletronics LIS3LV02Dx three-axis digital accelerometer"
         depends on ACPI && INPUT
+        select NEW_LEDS
+        select LEDS_CLASS
         default n
         help
           This driver provides support for the LIS3LV02Dx accelerometer. In
@@ -872,10 +884,16 @@ config SENSORS_LIS3LV02D
           /sys/devices/platform/lis3lv02d.
 
           This driver also provides an absolute input class device, allowing
-          the laptop to act as a pinball machine-esque joystick.
+          the laptop to act as a pinball machine-esque joystick. On HP laptops,
+          if the led infrastructure is activated, support for a led indicating
+          disk protection will be provided as hp:red:hddprotection.
 
-          This driver can also be built as a module.  If so, the module
-          will be called lis3lv02d.
+          This driver can also be built as modules.  If so, the core module
+          will be called lis3lv02d and a specific module for HP laptops will be
+          called hp_accel.
+
+          Say Y here if you have an applicable laptop and want to experience
+          the awesome power of lis3lv02d.
 
 config SENSORS_APPLESMC
         tristate "Apple SMC (Motion sensor, light sensor, keyboard backlight)"