diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-10-26 09:29:40 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-10-26 09:29:40 -0400 |
| commit | 9628d859750e1b0b1181ed96c64d341f1d5b6cee (patch) | |
| tree | 0a6a48608ed45ab68f1a56f80f392db4746a7e18 /drivers/hwmon/Makefile | |
| parent | 6f0c0580b70c89094b3422ba81118c7b959c7556 (diff) | |
| parent | 790440bc90fa800ff2a4b8b5046227a2ca32c1b1 (diff) | |
Merge branch 'vexpress-drivers' of git://git.linaro.org/people/pawelmoll/linux into next/drivers
Versatile Express changes from Pawel Moll <pawel.moll@arm.com>:
* 'vexpress-drivers' of git://git.linaro.org/people/pawelmoll/linux:
ARM: vexpress: Reset driver
hwmon: Versatile Express hwmon driver
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/hwmon/Makefile')
| -rw-r--r-- | drivers/hwmon/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile index 8d5fcb5e8e9f..aac8b7c619d6 100644 --- a/drivers/hwmon/Makefile +++ b/drivers/hwmon/Makefile | |||
| @@ -121,6 +121,7 @@ obj-$(CONFIG_SENSORS_TMP102) += tmp102.o | |||
| 121 | obj-$(CONFIG_SENSORS_TMP401) += tmp401.o | 121 | obj-$(CONFIG_SENSORS_TMP401) += tmp401.o |
| 122 | obj-$(CONFIG_SENSORS_TMP421) += tmp421.o | 122 | obj-$(CONFIG_SENSORS_TMP421) += tmp421.o |
| 123 | obj-$(CONFIG_SENSORS_TWL4030_MADC)+= twl4030-madc-hwmon.o | 123 | obj-$(CONFIG_SENSORS_TWL4030_MADC)+= twl4030-madc-hwmon.o |
| 124 | obj-$(CONFIG_SENSORS_VEXPRESS) += vexpress.o | ||
| 124 | obj-$(CONFIG_SENSORS_VIA_CPUTEMP)+= via-cputemp.o | 125 | obj-$(CONFIG_SENSORS_VIA_CPUTEMP)+= via-cputemp.o |
| 125 | obj-$(CONFIG_SENSORS_VIA686A) += via686a.o | 126 | obj-$(CONFIG_SENSORS_VIA686A) += via686a.o |
| 126 | obj-$(CONFIG_SENSORS_VT1211) += vt1211.o | 127 | obj-$(CONFIG_SENSORS_VT1211) += vt1211.o |