From: Colin Cross <ccross@android.com>
Date: Sat, 8 Jan 2011 22:47:29 +0000 (-0800)
Subject: Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~70
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c07aee9df0e40fe9621db66ec00857228090e46c;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36

Conflicts:
	drivers/misc/Kconfig
	drivers/misc/Makefile

Change-Id: I826244513f799fdd2fb0269abad3271c96661293
---

c07aee9df0e40fe9621db66ec00857228090e46c
diff --cc drivers/misc/Kconfig
index 0c273c04a306,aad1247743f7..c0377ca064ae
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@@ -332,14 -321,14 +332,22 @@@ config HMC635
  	  This driver provides support for the Honeywell HMC6352 compass,
  	  providing configuration and heading data via sysfs.
  
 +config SENSORS_AK8975
 +	tristate "AK8975 compass support"
 +	default n
 +	depends on I2C
 +	help
 +	  If you say yes here you get support for Asahi Kasei's
 +	  orientation sensor AK8975.
 +
+ config SENSORS_NCT1008
+ 	tristate "ON Semiconductor Temperature Sensor"
+ 	default n
+ 	depends on I2C
+ 	help
+ 	 Say yes here if you wish to include the ON Semiconductor
+ 	 NCT1008 Temperature sensor.
+ 
  config EP93XX_PWM
  	tristate "EP93xx PWM support"
  	depends on ARCH_EP93XX
diff --cc drivers/misc/Makefile
index 249ac2683aa5,51f2787d8d15..8edb90117929
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@@ -38,6 -35,4 +38,7 @@@ obj-y				+= eeprom
  obj-y				+= cb710/
  obj-$(CONFIG_VMWARE_BALLOON)	+= vmw_balloon.o
  obj-$(CONFIG_ARM_CHARLCD)	+= arm-charlcd.o
 +obj-$(CONFIG_WL127X_RFKILL)	+= wl127x-rfkill.o
 +obj-$(CONFIG_APANIC)		+= apanic.o
 +obj-$(CONFIG_SENSORS_AK8975)	+= akm8975.o
+ obj-$(CONFIG_SENSORS_NCT1008)	+= nct1008.o