diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 11:44:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 11:44:43 -0400 |
| commit | 10a0d912898ac2fe49094acf2c1339d0fb4c2bc6 (patch) | |
| tree | ca87b31c5b958599b313e40cc141748664687c51 /drivers/hwmon/Makefile | |
| parent | 51dcdfec6a274afc1c6fce180d582add9ff512c0 (diff) | |
| parent | 2c03d07ad54db03b813bb98c469790c07ca9f5dd (diff) | |
Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
hwmon: Add Asus ATK0110 support
hwmon: (lm95241) Convert to new-style i2c driver
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 96dc7f9439d2..1d3757837b4f 100644 --- a/drivers/hwmon/Makefile +++ b/drivers/hwmon/Makefile | |||
| @@ -32,6 +32,7 @@ obj-$(CONFIG_SENSORS_ADT7475) += adt7475.o | |||
| 32 | 32 | ||
| 33 | obj-$(CONFIG_SENSORS_APPLESMC) += applesmc.o | 33 | obj-$(CONFIG_SENSORS_APPLESMC) += applesmc.o |
| 34 | obj-$(CONFIG_SENSORS_AMS) += ams/ | 34 | obj-$(CONFIG_SENSORS_AMS) += ams/ |
| 35 | obj-$(CONFIG_SENSORS_ATK0110) += asus_atk0110.o | ||
| 35 | obj-$(CONFIG_SENSORS_ATXP1) += atxp1.o | 36 | obj-$(CONFIG_SENSORS_ATXP1) += atxp1.o |
| 36 | obj-$(CONFIG_SENSORS_CORETEMP) += coretemp.o | 37 | obj-$(CONFIG_SENSORS_CORETEMP) += coretemp.o |
| 37 | obj-$(CONFIG_SENSORS_DME1737) += dme1737.o | 38 | obj-$(CONFIG_SENSORS_DME1737) += dme1737.o |