diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 15:07:28 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 15:07:28 -0400 |
| commit | 36f021b579d195cdc5fa6f3e2bab198b4bf70643 (patch) | |
| tree | 96d3c97f5e5214d2aa7151c12a22a7eb345dbaa1 /drivers/hwmon/Makefile | |
| parent | 215d06780d13fd7de629b02b61b7b7bf88ce5039 (diff) | |
| parent | 1d72acf91abb327e25137ad2e371c1a788b34e45 (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: (32 commits)
Use menuconfig objects - hwmon
hwmon/smsc47b397: Use dynamic sysfs callbacks
hwmon/smsc47b397: Convert to a platform driver
hwmon/w83781d: Deprecate W83627HF support
hwmon/w83781d: Use dynamic sysfs callbacks
hwmon/w83781d: Be less i2c_client-centric
hwmon/w83781d: Clean up conversion macros
hwmon/w83781d: No longer use i2c-isa
hwmon/ams: Do not print error on systems without apple motion sensor
hwmon/ams: Fix I2C read retry logic
hwmon: New AD7416, AD7417 and AD7418 driver
hwmon/coretemp: Add documentation
hwmon: New coretemp driver
i386: Use functions from library in msr driver
i386: Add safe variants of rdmsr_on_cpu and wrmsr_on_cpu
hwmon/lm75: Use dynamic sysfs callbacks
hwmon/lm78: Use dynamic sysfs callbacks
hwmon/lm78: Be less i2c_client-centric
hwmon/lm78: No longer use i2c-isa
hwmon: New max6650 driver
...
Diffstat (limited to 'drivers/hwmon/Makefile')
| -rw-r--r-- | drivers/hwmon/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile index 544f8d8dff4e..cfaf338919dd 100644 --- a/drivers/hwmon/Makefile +++ b/drivers/hwmon/Makefile | |||
| @@ -14,6 +14,7 @@ obj-$(CONFIG_SENSORS_W83781D) += w83781d.o | |||
| 14 | obj-$(CONFIG_SENSORS_W83791D) += w83791d.o | 14 | obj-$(CONFIG_SENSORS_W83791D) += w83791d.o |
| 15 | 15 | ||
| 16 | obj-$(CONFIG_SENSORS_ABITUGURU) += abituguru.o | 16 | obj-$(CONFIG_SENSORS_ABITUGURU) += abituguru.o |
| 17 | obj-$(CONFIG_SENSORS_AD7418) += ad7418.o | ||
| 17 | obj-$(CONFIG_SENSORS_ADM1021) += adm1021.o | 18 | obj-$(CONFIG_SENSORS_ADM1021) += adm1021.o |
| 18 | obj-$(CONFIG_SENSORS_ADM1025) += adm1025.o | 19 | obj-$(CONFIG_SENSORS_ADM1025) += adm1025.o |
| 19 | obj-$(CONFIG_SENSORS_ADM1026) += adm1026.o | 20 | obj-$(CONFIG_SENSORS_ADM1026) += adm1026.o |
| @@ -23,6 +24,7 @@ obj-$(CONFIG_SENSORS_ADM9240) += adm9240.o | |||
| 23 | obj-$(CONFIG_SENSORS_APPLESMC) += applesmc.o | 24 | obj-$(CONFIG_SENSORS_APPLESMC) += applesmc.o |
| 24 | obj-$(CONFIG_SENSORS_AMS) += ams/ | 25 | obj-$(CONFIG_SENSORS_AMS) += ams/ |
| 25 | obj-$(CONFIG_SENSORS_ATXP1) += atxp1.o | 26 | obj-$(CONFIG_SENSORS_ATXP1) += atxp1.o |
| 27 | obj-$(CONFIG_SENSORS_CORETEMP) += coretemp.o | ||
| 26 | obj-$(CONFIG_SENSORS_DS1621) += ds1621.o | 28 | obj-$(CONFIG_SENSORS_DS1621) += ds1621.o |
| 27 | obj-$(CONFIG_SENSORS_F71805F) += f71805f.o | 29 | obj-$(CONFIG_SENSORS_F71805F) += f71805f.o |
| 28 | obj-$(CONFIG_SENSORS_FSCHER) += fscher.o | 30 | obj-$(CONFIG_SENSORS_FSCHER) += fscher.o |
| @@ -44,6 +46,7 @@ obj-$(CONFIG_SENSORS_LM87) += lm87.o | |||
| 44 | obj-$(CONFIG_SENSORS_LM90) += lm90.o | 46 | obj-$(CONFIG_SENSORS_LM90) += lm90.o |
| 45 | obj-$(CONFIG_SENSORS_LM92) += lm92.o | 47 | obj-$(CONFIG_SENSORS_LM92) += lm92.o |
| 46 | obj-$(CONFIG_SENSORS_MAX1619) += max1619.o | 48 | obj-$(CONFIG_SENSORS_MAX1619) += max1619.o |
| 49 | obj-$(CONFIG_SENSORS_MAX6650) += max6650.o | ||
| 47 | obj-$(CONFIG_SENSORS_PC87360) += pc87360.o | 50 | obj-$(CONFIG_SENSORS_PC87360) += pc87360.o |
| 48 | obj-$(CONFIG_SENSORS_PC87427) += pc87427.o | 51 | obj-$(CONFIG_SENSORS_PC87427) += pc87427.o |
| 49 | obj-$(CONFIG_SENSORS_SIS5595) += sis5595.o | 52 | obj-$(CONFIG_SENSORS_SIS5595) += sis5595.o |