diff options
| -rw-r--r-- | drivers/hwmon/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/hwmon/ntc_thermistor.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index bc196f49ec53..4af0da96c2e2 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig | |||
| @@ -1053,7 +1053,7 @@ config SENSORS_PC87427 | |||
| 1053 | 1053 | ||
| 1054 | config SENSORS_NTC_THERMISTOR | 1054 | config SENSORS_NTC_THERMISTOR |
| 1055 | tristate "NTC thermistor support" | 1055 | tristate "NTC thermistor support" |
| 1056 | depends on (!OF && !IIO) || (OF && IIO) | 1056 | depends on !OF || IIO=n || IIO |
| 1057 | help | 1057 | help |
| 1058 | This driver supports NTC thermistors sensor reading and its | 1058 | This driver supports NTC thermistors sensor reading and its |
| 1059 | interpretation. The driver can also monitor the temperature and | 1059 | interpretation. The driver can also monitor the temperature and |
diff --git a/drivers/hwmon/ntc_thermistor.c b/drivers/hwmon/ntc_thermistor.c index 8a17f01e8672..6b4413ce4d39 100644 --- a/drivers/hwmon/ntc_thermistor.c +++ b/drivers/hwmon/ntc_thermistor.c | |||
| @@ -141,7 +141,7 @@ struct ntc_data { | |||
| 141 | char name[PLATFORM_NAME_SIZE]; | 141 | char name[PLATFORM_NAME_SIZE]; |
| 142 | }; | 142 | }; |
| 143 | 143 | ||
| 144 | #ifdef CONFIG_OF | 144 | #if defined(CONFIG_OF) && IS_ENABLED(CONFIG_IIO) |
| 145 | static int ntc_adc_iio_read(struct ntc_thermistor_platform_data *pdata) | 145 | static int ntc_adc_iio_read(struct ntc_thermistor_platform_data *pdata) |
| 146 | { | 146 | { |
| 147 | struct iio_channel *channel = pdata->chan; | 147 | struct iio_channel *channel = pdata->chan; |
| @@ -223,6 +223,8 @@ ntc_thermistor_parse_dt(struct platform_device *pdev) | |||
| 223 | return NULL; | 223 | return NULL; |
| 224 | } | 224 | } |
| 225 | 225 | ||
| 226 | #define ntc_match NULL | ||
| 227 | |||
| 226 | static void ntc_iio_channel_release(struct ntc_thermistor_platform_data *pdata) | 228 | static void ntc_iio_channel_release(struct ntc_thermistor_platform_data *pdata) |
| 227 | { } | 229 | { } |
| 228 | #endif | 230 | #endif |
