diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2014-09-24 18:25:06 +0200 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2014-09-24 18:25:06 +0200 |
| commit | 7ad8966f4f0a4606dfaba119ea4e2b3ac4c548ee (patch) | |
| tree | 38a7548d5a36cc20145eb916319fe673b84341b1 /drivers/hwmon/Kconfig | |
| parent | hwmon: (ntc_thermistor) Add ntc thermistor to thermal subsystem as a sensor. (diff) | |
| parent | hwmon: (menf21bmc) Introduce MEN14F021P00 BMC HWMON driver (diff) | |
| download | linux-7ad8966f4f0a4606dfaba119ea4e2b3ac4c548ee.tar.xz linux-7ad8966f4f0a4606dfaba119ea4e2b3ac4c548ee.zip | |
Merge tag 'mfd-hwmon-leds-watchdog-v3.18' into hwmon-next
Immutable branch between MFD, HWMON, LEDs and Watchdog for v3.18
Diffstat (limited to 'drivers/hwmon/Kconfig')
| -rw-r--r-- | drivers/hwmon/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index f790b41283d0..5286d7ce1f9e 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig @@ -839,6 +839,16 @@ config SENSORS_MCP3021 This driver can also be built as a module. If so, the module will be called mcp3021. +config SENSORS_MENF21BMC_HWMON + tristate "MEN 14F021P00 BMC Hardware Monitoring" + depends on MFD_MENF21BMC + help + Say Y here to include support for the MEN 14F021P00 BMC + hardware monitoring. + + This driver can also be built as a module. If so the module + will be called menf21bmc_hwmon. + config SENSORS_ADCXX tristate "National Semiconductor ADCxxxSxxx" depends on SPI_MASTER |