1 files changed, 20 insertions, 65 deletions

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 1bfb4439e4e1..e4bd13b3cd8b 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -521,7 +521,7 @@ config SENSORS_LM75
                 - Dallas Semiconductor DS75 and DS1775
                 - Maxim MAX6625 and MAX6626
                 - Microchip MCP980x
-                - National Semiconductor LM75
+                - National Semiconductor LM75, LM75A
                 - NXP's LM75A
                 - ST Microelectronics STDS75
                 - TelCom (now Microchip) TCN75
@@ -959,6 +959,25 @@ config SENSORS_SMSC47B397
           This driver can also be built as a module.  If so, the module
           will be called smsc47b397.
 
+config SENSORS_SCH5627
+        tristate "SMSC SCH5627"
+        help
+          If you say yes here you get support for the hardware monitoring
+          features of the SMSC SCH5627 Super-I/O chip.
+
+          This driver can also be built as a module.  If so, the module
+          will be called sch5627.
+
+config SENSORS_ADS1015
+        tristate "Texas Instruments ADS1015"
+        depends on I2C
+        help
+          If you say yes here you get support for Texas Instruments ADS1015
+          12-bit 4-input ADC device.
+
+          This driver can also be built as a module.  If so, the module
+          will be called ads1015.
+
 config SENSORS_ADS7828
         tristate "Texas Instruments ADS7828"
         depends on I2C
@@ -1215,40 +1234,6 @@ config SENSORS_ULTRA45
           This driver provides support for the Ultra45 workstation environmental
           sensors.
 
-config SENSORS_LIS3_SPI
-        tristate "STMicroeletronics LIS3LV02Dx three-axis digital accelerometer (SPI)"
-        depends on !ACPI && SPI_MASTER && INPUT
-        select INPUT_POLLDEV
-        default n
-        help
-          This driver provides support for the LIS3LV02Dx accelerometer connected
-          via SPI. The accelerometer data is readable via
-          /sys/devices/platform/lis3lv02d.
-
-          This driver also provides an absolute input class device, allowing
-          the laptop to act as a pinball machine-esque joystick.
-
-          This driver can also be built as modules.  If so, the core module
-          will be called lis3lv02d and a specific module for the SPI transport
-          is called lis3lv02d_spi.
-
-config SENSORS_LIS3_I2C
-        tristate "STMicroeletronics LIS3LV02Dx three-axis digital accelerometer (I2C)"
-        depends on I2C && INPUT
-        select INPUT_POLLDEV
-        default n
-        help
-          This driver provides support for the LIS3LV02Dx accelerometer connected
-          via I2C. The accelerometer data is readable via
-          /sys/devices/platform/lis3lv02d.
-
-          This driver also provides an absolute input class device, allowing
-          the device to act as a pinball machine-esque joystick.
-
-          This driver can also be built as modules.  If so, the core module
-          will be called lis3lv02d and a specific module for the I2C transport
-          is called lis3lv02d_i2c.
-
 config SENSORS_APPLESMC
         tristate "Apple SMC (Motion sensor, light sensor, keyboard backlight)"
         depends on INPUT && X86
@@ -1296,36 +1281,6 @@ config SENSORS_ATK0110
           This driver can also be built as a module. If so, the module
           will be called asus_atk0110.
 
-config SENSORS_LIS3LV02D
-        tristate "STMicroeletronics LIS3* three-axis digital accelerometer"
-        depends on INPUT
-        select INPUT_POLLDEV
-        select NEW_LEDS
-        select LEDS_CLASS
-        default n
-        help
-          This driver provides support for the LIS3* accelerometers, such as the
-          LIS3LV02DL or the LIS331DL. In particular, it can be found in a number
-          of HP laptops, which have the "Mobile Data Protection System 3D" or
-          "3D DriveGuard" feature. On such systems the driver should load
-          automatically (via ACPI alias). The accelerometer might also be found
-          in other systems, connected via SPI or I2C. The accelerometer data is
-          readable via /sys/devices/platform/lis3lv02d.
-
-          This driver also provides an absolute input class device, allowing
-          a laptop to act as a pinball machine-esque joystick. It provides also
-          a misc device which can be used to detect free-fall. On HP laptops,
-          if the led infrastructure is activated, support for a led indicating
-          disk protection will be provided as hp::hddprotect. For more
-          information on the feature, refer to Documentation/hwmon/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.
-
 endif # ACPI
 
 endif # HWMON