From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 Dec 2009 00:48:08 +0000 (-0800)
Subject: Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv... 
X-Git-Tag: upstream/snapshot3+hdmi~16065
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e82b1dae2a8730c89e2a30c5c28562ef066f39d9;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'hwmon-for-linus' of git://git./linux/kernel/git/jdelvare/staging

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  hwmon: (w83627hf) Fix for "No such device"
  hwmon: (sht15) Off-by-one error in array index + incorrect constants
  hwmon: Add driver for VIA CPU core temperature
  hwmon: (smsc47m1) Enable device if needed
  hwmon: (smsc47m1) Fail module loading on error
  hwmon: (smsc47m1) Only request I/O ports we really use
  hwmon: New driver for AMD Family 10h/11h CPUs
---

e82b1dae2a8730c89e2a30c5c28562ef066f39d9
diff --cc drivers/hwmon/Makefile
index 4131e25,312b7c3..450c8e8
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@@ -53,9 -53,9 +53,10 @@@ obj-$(CONFIG_SENSORS_IBMAEM)	+= ibmaem.
  obj-$(CONFIG_SENSORS_IBMPEX)	+= ibmpex.o
  obj-$(CONFIG_SENSORS_IT87)	+= it87.o
  obj-$(CONFIG_SENSORS_K8TEMP)	+= k8temp.o
+ obj-$(CONFIG_SENSORS_K10TEMP)	+= k10temp.o
  obj-$(CONFIG_SENSORS_LIS3LV02D) += lis3lv02d.o hp_accel.o
  obj-$(CONFIG_SENSORS_LIS3_SPI)	+= lis3lv02d.o lis3lv02d_spi.o
 +obj-$(CONFIG_SENSORS_LIS3_I2C)	+= lis3lv02d.o lis3lv02d_i2c.o
  obj-$(CONFIG_SENSORS_LM63)	+= lm63.o
  obj-$(CONFIG_SENSORS_LM70)	+= lm70.o
  obj-$(CONFIG_SENSORS_LM73)	+= lm73.o