diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-07 13:55:20 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-07 13:55:20 +1100 |
| commit | a263e236f1c2c06dfa20b96d592f50e1b87d4bd9 (patch) | |
| tree | 03b1941307094f379a8ecd430f84f38c71f1a731 /drivers/hwmon/Makefile | |
| parent | 3e2c17abc781e6be256ec578078334ef701602bc (diff) | |
| parent | be04a9aaf8a99f6ca64c532ab0aafb00a78b44d4 (diff) | |
Merge remote-tracking branch 'mfd/for-next'
Conflicts:
arch/arm/mach-imx/mach-mx27_3ds.c
arch/arm/mach-imx/mach-pcm038.c
arch/arm/mach-mx3/mach-mx31_3ds.c
arch/arm/mach-mx3/mach-mx31moboard.c
drivers/mfd/davinci_voicecodec.c
drivers/mfd/ucb1x00-ts.c
drivers/mfd/wm8994-core.c
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 49788a1afcf6..91e145c57b7b 100644 --- a/drivers/hwmon/Makefile +++ b/drivers/hwmon/Makefile @@ -102,6 +102,7 @@ obj-$(CONFIG_SENSORS_THMC50) += thmc50.o obj-$(CONFIG_SENSORS_TMP102) += tmp102.o obj-$(CONFIG_SENSORS_TMP401) += tmp401.o obj-$(CONFIG_SENSORS_TMP421) += tmp421.o +obj-$(CONFIG_SENSORS_TWL4030_MADC)+= twl4030-madc-hwmon.o obj-$(CONFIG_SENSORS_VIA_CPUTEMP)+= via-cputemp.o obj-$(CONFIG_SENSORS_VIA686A) += via686a.o obj-$(CONFIG_SENSORS_VT1211) += vt1211.o |