diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 18:20:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 18:20:16 -0400 |
| commit | 3e56d49390cd161f34cc049a3661045183d276d5 (patch) | |
| tree | 0006f1cd2f1b1be6c7149a3234a9ab3ff76c7e80 /drivers/hwmon/Makefile | |
| parent | c82ffab9a857f8286ed2b559624b7005a367b638 (diff) | |
| parent | 58f055e5314856a3badfa61fe144347903488989 (diff) | |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
hwmon: (ltc4245) Clear faults at startup
hwmon: (ltc4215) Clear faults at startup
hwmon: (coretemp) Add Lynnfield CPU
hwmon: (coretemp) Add support for Penryn mobile CPUs
hwmon: (coretemp) Fix Atom CPUs support
hwmon: Delete deprecated FSC drivers
hwmon: (adm1031) Add sysfs files for temperature offsets
Diffstat (limited to 'drivers/hwmon/Makefile')
| -rw-r--r-- | drivers/hwmon/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile index bcf73a9bb619..9f46cb019cc6 100644 --- a/drivers/hwmon/Makefile +++ b/drivers/hwmon/Makefile | |||
| @@ -42,9 +42,7 @@ obj-$(CONFIG_SENSORS_DS1621) += ds1621.o | |||
| 42 | obj-$(CONFIG_SENSORS_F71805F) += f71805f.o | 42 | obj-$(CONFIG_SENSORS_F71805F) += f71805f.o |
| 43 | obj-$(CONFIG_SENSORS_F71882FG) += f71882fg.o | 43 | obj-$(CONFIG_SENSORS_F71882FG) += f71882fg.o |
| 44 | obj-$(CONFIG_SENSORS_F75375S) += f75375s.o | 44 | obj-$(CONFIG_SENSORS_F75375S) += f75375s.o |
| 45 | obj-$(CONFIG_SENSORS_FSCHER) += fscher.o | ||
| 46 | obj-$(CONFIG_SENSORS_FSCHMD) += fschmd.o | 45 | obj-$(CONFIG_SENSORS_FSCHMD) += fschmd.o |
| 47 | obj-$(CONFIG_SENSORS_FSCPOS) += fscpos.o | ||
| 48 | obj-$(CONFIG_SENSORS_G760A) += g760a.o | 46 | obj-$(CONFIG_SENSORS_G760A) += g760a.o |
| 49 | obj-$(CONFIG_SENSORS_GL518SM) += gl518sm.o | 47 | obj-$(CONFIG_SENSORS_GL518SM) += gl518sm.o |
| 50 | obj-$(CONFIG_SENSORS_GL520SM) += gl520sm.o | 48 | obj-$(CONFIG_SENSORS_GL520SM) += gl520sm.o |