From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 16 Jan 2009 00:40:12 +0000 (-0800)
Subject: Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
X-Git-Tag: v2.6.29-rc2~12
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=7e92214b539ea17ccaf0886d140cbba9801a4d40;hp=-c;p=linux-2.6-omap-h63xx.git

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: (abituguru3) Fix CONFIG_DMI=n fallback to probe
  hwmon: (abituguru3) Enable DMI probing feature on IN9 32X MAX
  hwmon: (abituguru3) Match partial DMI board name strings
  hwmon: Add a driver for the ADT7475 hardware monitoring chip
  hwmon: (k8temp) Fix temperature reporting for (most) K8 RevG CPUs
  hwmon: (k8temp) Fix wrong sensor selection for AMD K8 RevF/RevG CPUs
  hwmon: (k8temp) Warn about fam F rev F errata
---

7e92214b539ea17ccaf0886d140cbba9801a4d40
diff --combined drivers/hwmon/Kconfig
index 54b43bea5e4,5c349a19a3a..b84bf066879
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@@ -189,6 -189,16 +189,16 @@@ config SENSORS_ADT747
  	  This driver can also be built as a module. If so, the module
  	  will be called adt7473.
  
+ config SENSORS_ADT7475
+ 	tristate "Analog Devices ADT7475"
+ 	depends on I2C && EXPERIMENTAL
+ 	help
+ 	  If you say yes here you get support for the Analog Devices
+ 	  ADT7475 hardware monitoring chips.
+ 
+ 	  This driver can also be build as a module.  If so, the module
+ 	  will be called adt7475.
+ 
  config SENSORS_K8TEMP
  	tristate "AMD Athlon64/FX or Opteron temperature sensor"
  	depends on X86 && PCI && EXPERIMENTAL
@@@ -861,8 -871,6 +871,8 @@@ config SENSORS_HDAP
  config SENSORS_LIS3LV02D
  	tristate "STMicroeletronics LIS3LV02Dx three-axis digital accelerometer"
  	depends on ACPI && INPUT
 +	select NEW_LEDS
 +	select LEDS_CLASS
  	default n
  	help
  	  This driver provides support for the LIS3LV02Dx accelerometer. In
@@@ -874,16 -882,10 +884,16 @@@
  	  /sys/devices/platform/lis3lv02d.
  
  	  This driver also provides an absolute input class device, allowing
 -	  the laptop to act as a pinball machine-esque joystick.
 +	  the laptop to act as a pinball machine-esque joystick. On HP laptops,
 +	  if the led infrastructure is activated, support for a led indicating
 +	  disk protection will be provided as hp:red:hddprotection.
  
 -	  This driver can also be built as a module.  If so, the module
 -	  will be called lis3lv02d.
 +	  This driver can also be built as modules.  If so, the core module
 +	  will be called lis3lv02d and a specific module for HP laptops will be
 +	  called hp_accel.
 +
 +	  Say Y here if you have an applicable laptop and want to experience
 +	  the awesome power of lis3lv02d.
  
  config SENSORS_APPLESMC
  	tristate "Apple SMC (Motion sensor, light sensor, keyboard backlight)"