diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-30 20:54:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-30 20:54:32 -0400 |
| commit | 3c6fae67d026d57f64eb3da9c0d0e76983e39ae3 (patch) | |
| tree | a11f2ff6d99b382fff02a643f6b6b204efb9c40e /drivers/hwmon/Makefile | |
| parent | c4e1aa67ed9e4e542a064bc271ddbf152b677e91 (diff) | |
| parent | de15f093e666ccd542f6f7a0e3e917166a07ab44 (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: (fschmd) Add support for the FSC Hades IC
hwmon: (fschmd) Add support for the FSC Syleus IC
i2c-i801: Instantiate FSC hardware montioring chips
dmi: Let dmi_walk() users pass private data
hwmon: Define a standard interface for chassis intrusion detection
Move the pcf8591 driver to hwmon
hwmon: (w83627ehf) Only expose in6 or temp3 on the W83667HG
hwmon: (w83627ehf) Add support for W83667HG
hwmon: (w83627ehf) Invert fan pin variables logic
hwmon: (hdaps) Fix Thinkpad X41 axis inversion
hwmon: (hdaps) Allow inversion of separate axis
hwmon: (ds1621) Clean up documentation
hwmon: (ds1621) Avoid unneeded register access
hwmon: (ds1621) Clean up register access
hwmon: (ds1621) Reorder code statements
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 2e80f37f39eb..e332d6267920 100644 --- a/drivers/hwmon/Makefile +++ b/drivers/hwmon/Makefile | |||
| @@ -70,6 +70,7 @@ obj-$(CONFIG_SENSORS_MAX1619) += max1619.o | |||
| 70 | obj-$(CONFIG_SENSORS_MAX6650) += max6650.o | 70 | obj-$(CONFIG_SENSORS_MAX6650) += max6650.o |
| 71 | obj-$(CONFIG_SENSORS_PC87360) += pc87360.o | 71 | obj-$(CONFIG_SENSORS_PC87360) += pc87360.o |
| 72 | obj-$(CONFIG_SENSORS_PC87427) += pc87427.o | 72 | obj-$(CONFIG_SENSORS_PC87427) += pc87427.o |
| 73 | obj-$(CONFIG_SENSORS_PCF8591) += pcf8591.o | ||
| 73 | obj-$(CONFIG_SENSORS_SIS5595) += sis5595.o | 74 | obj-$(CONFIG_SENSORS_SIS5595) += sis5595.o |
| 74 | obj-$(CONFIG_SENSORS_SMSC47B397)+= smsc47b397.o | 75 | obj-$(CONFIG_SENSORS_SMSC47B397)+= smsc47b397.o |
| 75 | obj-$(CONFIG_SENSORS_SMSC47M1) += smsc47m1.o | 76 | obj-$(CONFIG_SENSORS_SMSC47M1) += smsc47m1.o |