diff options
| author | Jens Axboe <axboe@fb.com> | 2014-04-16 00:02:24 +0400 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-04-16 00:02:24 +0400 |
| commit | f89e0dd9d1a72fdf6b8958bcadfa6abf84f3cae0 (patch) | |
| tree | 6d4ca8c67dc22d1c81053392078588f9ab3804b5 /drivers/hwmon/Kconfig | |
| parent | 21f9fcd81593e201172160853b8647336fb81f4f (diff) | |
| parent | c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 (diff) | |
| download | linux-f89e0dd9d1a72fdf6b8958bcadfa6abf84f3cae0.tar.xz | |
Merge tag 'v3.15-rc1' into for-3.16/core
We don't like this, but things have diverged with the blk-mq fixes
in 3.15-rc1. So merge it in.
Diffstat (limited to 'drivers/hwmon/Kconfig')
| -rw-r--r-- | drivers/hwmon/Kconfig | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index b13172cfbeef..bc196f49ec53 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig @@ -554,14 +554,6 @@ config SENSORS_IBMPEX This driver can also be built as a module. If so, the module will be called ibmpex. -config SENSORS_IBMPOWERNV - tristate "IBM PowerNv Platform temperature/power/fan sensor" - depends on PPC_POWERNV - default y - help - If you say yes here you get support for the temperature/fan/power - sensors on your platform. - config SENSORS_IIO_HWMON tristate "Hwmon driver that uses channels specified via iio maps" depends on IIO |