diff -uprN -X linux-2.6.36.2/Documentation/dontdiff linux-2.6.36.2/drivers/hwmon/Kconfig linux-new/drivers/hwmon/Kconfig --- linux-2.6.36.2/drivers/hwmon/Kconfig 2010-10-20 16:30:22.000000000 -0400 +++ linux-new/drivers/hwmon/Kconfig 2011-01-17 12:21:12.292000226 -0500 @@ -310,6 +310,16 @@ config SENSORS_DS1621 This driver can also be built as a module. If so, the module will be called ds1621. +config SENSORS_EMC1023 + tristate "SMSC emc1023 Thermal Sensor" + depends on I2C + help + If you say yes here you get support for the SMC1023 Thermal Sensor + monitoring chip + + This driver can also be built as a module. If so, the module + will be called emc1023 + config SENSORS_I5K_AMB tristate "FB-DIMM AMB temperature sensor on Intel 5000 series chipsets" depends on PCI && EXPERIMENTAL diff -uprN -X linux-2.6.36.2/Documentation/dontdiff linux-2.6.36.2/drivers/hwmon/Makefile linux-new/drivers/hwmon/Makefile --- linux-2.6.36.2/drivers/hwmon/Makefile 2010-10-20 16:30:22.000000000 -0400 +++ linux-new/drivers/hwmon/Makefile 2011-01-17 11:44:16.799999396 -0500 @@ -107,6 +107,7 @@ obj-$(CONFIG_SENSORS_W83627EHF) += w8362 obj-$(CONFIG_SENSORS_W83L785TS) += w83l785ts.o obj-$(CONFIG_SENSORS_W83L786NG) += w83l786ng.o obj-$(CONFIG_SENSORS_WM831X) += wm831x-hwmon.o +obj-$(CONFIG_SENSORS_EMC1023) += emc1023.o obj-$(CONFIG_SENSORS_WM8350) += wm8350-hwmon.o ifeq ($(CONFIG_HWMON_DEBUG_CHIP),y)