From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 8 May 2007 19:07:28 +0000 (-0700)
Subject: Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
X-Git-Tag: v2.6.22-rc1~351
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=36f021b579d195cdc5fa6f3e2bab198b4bf70643;p=linux.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: (32 commits)
  Use menuconfig objects - hwmon
  hwmon/smsc47b397: Use dynamic sysfs callbacks
  hwmon/smsc47b397: Convert to a platform driver
  hwmon/w83781d: Deprecate W83627HF support
  hwmon/w83781d: Use dynamic sysfs callbacks
  hwmon/w83781d: Be less i2c_client-centric
  hwmon/w83781d: Clean up conversion macros
  hwmon/w83781d: No longer use i2c-isa
  hwmon/ams: Do not print error on systems without apple motion sensor
  hwmon/ams: Fix I2C read retry logic
  hwmon: New AD7416, AD7417 and AD7418 driver
  hwmon/coretemp: Add documentation
  hwmon: New coretemp driver
  i386: Use functions from library in msr driver
  i386: Add safe variants of rdmsr_on_cpu and wrmsr_on_cpu
  hwmon/lm75: Use dynamic sysfs callbacks
  hwmon/lm78: Use dynamic sysfs callbacks
  hwmon/lm78: Be less i2c_client-centric
  hwmon/lm78: No longer use i2c-isa
  hwmon: New max6650 driver
  ...
---

36f021b579d195cdc5fa6f3e2bab198b4bf70643
diff --cc drivers/hwmon/Kconfig
index 25b72a491702,a853eb2dda73..3ba3a5221c41
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@@ -594,33 -617,8 +617,32 @@@ config SENSORS_HDAP
  	  Say Y here if you have an applicable laptop and want to experience
  	  the awesome power of hdaps.
  
 +config SENSORS_APPLESMC
 +	tristate "Apple SMC (Motion sensor, light sensor, keyboard backlight)"
 +	depends on HWMON && INPUT && X86
 +	select NEW_LEDS
 +	select LEDS_CLASS
 +	default n
 +	help
 +	  This driver provides support for the Apple System Management
 +	  Controller, which provides an accelerometer (Apple Sudden Motion
 +	  Sensor), light sensors, temperature sensors, keyboard backlight
 +	  control and fan control.
 +
 +	  Only Intel-based Apple's computers are supported (MacBook Pro,
 +	  MacBook, MacMini).
 +
 +	  Data from the different sensors, keyboard backlight control and fan
 +	  control are accessible via sysfs.
 +
 +	  This driver also provides an absolute input class device, allowing
 +	  the laptop to act as a pinball machine-esque joystick.
 +
 +	  Say Y here if you have an applicable laptop and want to experience
 +	  the awesome power of applesmc.
 +
  config HWMON_DEBUG_CHIP
  	bool "Hardware Monitoring Chip debugging messages"
- 	depends on HWMON
  	default n
  	help
  	  Say Y here if you want the I2C chip drivers to produce a bunch of
diff --cc drivers/hwmon/Makefile
index 544f8d8dff4e,d83f2380e089..cfaf338919dd
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@@ -20,9 -21,9 +21,10 @@@ obj-$(CONFIG_SENSORS_ADM1026)	+= adm102
  obj-$(CONFIG_SENSORS_ADM1029)	+= adm1029.o
  obj-$(CONFIG_SENSORS_ADM1031)	+= adm1031.o
  obj-$(CONFIG_SENSORS_ADM9240)	+= adm9240.o
 +obj-$(CONFIG_SENSORS_APPLESMC)	+= applesmc.o
  obj-$(CONFIG_SENSORS_AMS)	+= ams/
  obj-$(CONFIG_SENSORS_ATXP1)	+= atxp1.o
+ obj-$(CONFIG_SENSORS_CORETEMP)	+= coretemp.o
  obj-$(CONFIG_SENSORS_DS1621)	+= ds1621.o
  obj-$(CONFIG_SENSORS_F71805F)	+= f71805f.o
  obj-$(CONFIG_SENSORS_FSCHER)	+= fscher.o