diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2014-09-24 12:25:06 -0400 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2014-09-24 12:25:06 -0400 |
| commit | 7ad8966f4f0a4606dfaba119ea4e2b3ac4c548ee (patch) | |
| tree | 38a7548d5a36cc20145eb916319fe673b84341b1 /drivers/hwmon/Kconfig | |
| parent | c08860ffe5c0e986e208e8217dae8191c0b40b24 (diff) | |
| parent | 964356938fcd3c0001a786f55b9f0a0fbe47656a (diff) | |
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 | |||
| 839 | This driver can also be built as a module. If so, the module | 839 | This driver can also be built as a module. If so, the module |
| 840 | will be called mcp3021. | 840 | will be called mcp3021. |
| 841 | 841 | ||
| 842 | config SENSORS_MENF21BMC_HWMON | ||
| 843 | tristate "MEN 14F021P00 BMC Hardware Monitoring" | ||
| 844 | depends on MFD_MENF21BMC | ||
| 845 | help | ||
| 846 | Say Y here to include support for the MEN 14F021P00 BMC | ||
| 847 | hardware monitoring. | ||
| 848 | |||
| 849 | This driver can also be built as a module. If so the module | ||
| 850 | will be called menf21bmc_hwmon. | ||
| 851 | |||
| 842 | config SENSORS_ADCXX | 852 | config SENSORS_ADCXX |
| 843 | tristate "National Semiconductor ADCxxxSxxx" | 853 | tristate "National Semiconductor ADCxxxSxxx" |
| 844 | depends on SPI_MASTER | 854 | depends on SPI_MASTER |