diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-02-10 14:35:36 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-02-10 14:35:36 -0500 |
| commit | 4ba24fef3eb3b142197135223b90ced2f319cd53 (patch) | |
| tree | a20c125b27740ec7b4c761b11d801108e1b316b2 /drivers/hwmon/Makefile | |
| parent | 47c1ffb2b6b630894e9a16442611c056ab21c057 (diff) | |
| parent | 98a4a59ee31a12105a2b84f5b8b515ac2cb208ef (diff) | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 3.20.
Diffstat (limited to 'drivers/hwmon/Makefile')
| -rw-r--r-- | drivers/hwmon/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile index be28152c9848..67280643bcf0 100644 --- a/drivers/hwmon/Makefile +++ b/drivers/hwmon/Makefile | |||
| @@ -115,8 +115,10 @@ obj-$(CONFIG_SENSORS_MAX6650) += max6650.o | |||
| 115 | obj-$(CONFIG_SENSORS_MAX6697) += max6697.o | 115 | obj-$(CONFIG_SENSORS_MAX6697) += max6697.o |
| 116 | obj-$(CONFIG_SENSORS_MC13783_ADC)+= mc13783-adc.o | 116 | obj-$(CONFIG_SENSORS_MC13783_ADC)+= mc13783-adc.o |
| 117 | obj-$(CONFIG_SENSORS_MCP3021) += mcp3021.o | 117 | obj-$(CONFIG_SENSORS_MCP3021) += mcp3021.o |
| 118 | obj-$(CONFIG_SENSORS_MENF21BMC_HWMON) += menf21bmc_hwmon.o | ||
| 118 | obj-$(CONFIG_SENSORS_NCT6683) += nct6683.o | 119 | obj-$(CONFIG_SENSORS_NCT6683) += nct6683.o |
| 119 | obj-$(CONFIG_SENSORS_NCT6775) += nct6775.o | 120 | obj-$(CONFIG_SENSORS_NCT6775) += nct6775.o |
| 121 | obj-$(CONFIG_SENSORS_NCT7802) += nct7802.o | ||
| 120 | obj-$(CONFIG_SENSORS_NTC_THERMISTOR) += ntc_thermistor.o | 122 | obj-$(CONFIG_SENSORS_NTC_THERMISTOR) += ntc_thermistor.o |
| 121 | obj-$(CONFIG_SENSORS_PC87360) += pc87360.o | 123 | obj-$(CONFIG_SENSORS_PC87360) += pc87360.o |
| 122 | obj-$(CONFIG_SENSORS_PC87427) += pc87427.o | 124 | obj-$(CONFIG_SENSORS_PC87427) += pc87427.o |