Commit 573f2ce2 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Merge greg@deskfan:linux/BK/i2c-new_drivers-2.6

into kroah.com:/home/greg/linux/BK/i2c-new_drivers-2.6
parents 90d0999c 7cbfaf48
...@@ -68,6 +68,17 @@ config SENSORS_LM78 ...@@ -68,6 +68,17 @@ config SENSORS_LM78
This driver can also be built as a module. If so, the module This driver can also be built as a module. If so, the module
will be called lm78. will be called lm78.
config SENSORS_LM83
tristate "National Semiconductor LM83"
depends on I2C && EXPERIMENTAL
select I2C_SENSOR
help
If you say yes here you get support for National Semiconductor
LM83 sensor chips.
This driver can also be built as a module. If so, the module
will be called lm83.
config SENSORS_LM85 config SENSORS_LM85
tristate "National Semiconductor LM85 and compatibles" tristate "National Semiconductor LM85 and compatibles"
depends on I2C && EXPERIMENTAL depends on I2C && EXPERIMENTAL
......
...@@ -10,5 +10,6 @@ obj-$(CONFIG_SENSORS_EEPROM) += eeprom.o ...@@ -10,5 +10,6 @@ obj-$(CONFIG_SENSORS_EEPROM) += eeprom.o
obj-$(CONFIG_SENSORS_IT87) += it87.o obj-$(CONFIG_SENSORS_IT87) += it87.o
obj-$(CONFIG_SENSORS_LM75) += lm75.o obj-$(CONFIG_SENSORS_LM75) += lm75.o
obj-$(CONFIG_SENSORS_LM78) += lm78.o obj-$(CONFIG_SENSORS_LM78) += lm78.o
obj-$(CONFIG_SENSORS_LM83) += lm83.o
obj-$(CONFIG_SENSORS_LM85) += lm85.o obj-$(CONFIG_SENSORS_LM85) += lm85.o
obj-$(CONFIG_SENSORS_VIA686A) += via686a.o obj-$(CONFIG_SENSORS_VIA686A) += via686a.o
This diff is collapsed.
...@@ -153,6 +153,7 @@ ...@@ -153,6 +153,7 @@
#define I2C_DRIVERID_FS451 1037 #define I2C_DRIVERID_FS451 1037
#define I2C_DRIVERID_W83627HF 1038 #define I2C_DRIVERID_W83627HF 1038
#define I2C_DRIVERID_LM85 1039 #define I2C_DRIVERID_LM85 1039
#define I2C_DRIVERID_LM83 1040
/* /*
* ---- Adapter types ---------------------------------------------------- * ---- Adapter types ----------------------------------------------------
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment