diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-21 19:37:42 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-21 19:37:42 -0500 |
commit | bfe38ccf8d0b541f387f65267f6f3794be59233a (patch) | |
tree | c1f5cece3247431b3d2c484da831d2eb0fd6c9e0 /drivers/hwmon/Makefile | |
parent | 20f8d2a49360980f1dc0afe2ea227e3ba887e575 (diff) | |
parent | 25e9c86d5a6d82ea45eb680fc66bf73ac5e50dff (diff) |
Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6
* 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6:
hwmon: normal_i2c arrays should be const
hwmon: New driver for Analog Devices ADT7473 sensor chip
hwmon: (coretemp) Add Penryn CPU to coretemp
hwmon: (coretemp) Add TjMax detection for mobile CPUs
hwmon: (applesmc) sensors set for MacBook2
hwmon: (thmc50) Storage class should be before const qualifier
hwmon: (coretemp) fix section mismatch warning
hwmon: (coretemp) Add maximum cooling temperature readout
hwmon: (adm1026) Properly terminate sysfs groups
hwmon: (vt8231) Update maintainer email address
hwmon: (vt8231) Add individual alarm files
hwmon: (via686a) Add individual alarm files
hwmon: (smsc47m1) Add individual alarm files
hwmon: (max1619) Add individual alarm and fault files
hwmon: (lm92) Add individual alarm files
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 824161337f1c..3bdb05a5cbd7 100644 --- a/drivers/hwmon/Makefile +++ b/drivers/hwmon/Makefile | |||
@@ -24,6 +24,7 @@ obj-$(CONFIG_SENSORS_ADM1031) += adm1031.o | |||
24 | obj-$(CONFIG_SENSORS_ADM9240) += adm9240.o | 24 | obj-$(CONFIG_SENSORS_ADM9240) += adm9240.o |
25 | obj-$(CONFIG_SENSORS_ADS7828) += ads7828.o | 25 | obj-$(CONFIG_SENSORS_ADS7828) += ads7828.o |
26 | obj-$(CONFIG_SENSORS_ADT7470) += adt7470.o | 26 | obj-$(CONFIG_SENSORS_ADT7470) += adt7470.o |
27 | obj-$(CONFIG_SENSORS_ADT7473) += adt7473.o | ||
27 | obj-$(CONFIG_SENSORS_APPLESMC) += applesmc.o | 28 | obj-$(CONFIG_SENSORS_APPLESMC) += applesmc.o |
28 | obj-$(CONFIG_SENSORS_AMS) += ams/ | 29 | obj-$(CONFIG_SENSORS_AMS) += ams/ |
29 | obj-$(CONFIG_SENSORS_ATXP1) += atxp1.o | 30 | obj-$(CONFIG_SENSORS_ATXP1) += atxp1.o |