aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2006-12-13 12:13:19 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-13 12:13:19 -0500
commitbbc7610c062074468f362b37d33603536e87fb96 (patch)
tree71fe8b24a4f7925167407adda1396fbfda700e5b /include
parent5cbded585d129d0226cb48ac4202b253c781be26 (diff)
parent284f42b627c070a2dd07b5c072cbd75d7fbb7c96 (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 MAINTAINERS entry for new ams driver hwmon: New AMS hardware monitoring driver hwmon/w83793: Add documentation and maintainer hwmon: New Winbond W83793 hardware monitoring driver hwmon: Update Rudolf Marek's e-mail address hwmon/f71805f: Fix the device address decoding hwmon/f71805f: Always create all fan inputs hwmon/f71805f: Add support for the Fintek F71872F/FG chip hwmon: New PC87427 hardware monitoring driver hwmon/it87: Remove the SMBus interface support hwmon/hdaps: Update the list of supported devices hwmon/hdaps: Move the DMI detection data to .data hwmon/pc87360: Autodetect the VRM version hwmon/f71805f: Document the fan control features hwmon/f71805f: Add support for "speed mode" fan speed control hwmon/f71805f: Support DC fan speed control mode hwmon/f71805f: Let the user adjust the PWM base frequency hwmon/f71805f: Add manual fan speed control hwmon/f71805f: Store the fan control registers
Diffstat (limited to 'include')
-rw-r--r--include/linux/i2c-id.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
index 7ae3c332664..d38778f2fbe 100644
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@ -142,7 +142,6 @@
142#define I2C_DRIVERID_MTP008 1023 142#define I2C_DRIVERID_MTP008 1023
143#define I2C_DRIVERID_DS1621 1024 143#define I2C_DRIVERID_DS1621 1024
144#define I2C_DRIVERID_ADM1024 1025 144#define I2C_DRIVERID_ADM1024 1025
145#define I2C_DRIVERID_IT87 1026
146#define I2C_DRIVERID_CH700X 1027 /* single driver for CH7003-7009 digital pc to tv encoders */ 145#define I2C_DRIVERID_CH700X 1027 /* single driver for CH7003-7009 digital pc to tv encoders */
147#define I2C_DRIVERID_FSCPOS 1028 146#define I2C_DRIVERID_FSCPOS 1028
148#define I2C_DRIVERID_FSCSCY 1029 147#define I2C_DRIVERID_FSCSCY 1029