---

yaml --- r: 248613 b: refs/heads/master c: 5e99c2f h: refs/heads/master i: 248611: 8beb645 v: v3
git-mirror · May 21, 2011 · f030fc0 · f030fc0
1 parent b1ad98c
commit f030fc0
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 489 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 199e0de7f5df31a4fc485d4aaaf8a07718252ace
+refs/heads/master: 5e99c2f1e0c86d27ed2a5261442126cd0935bc69
diff --git a/trunk/Documentation/hwmon/pkgtemp b/trunk/Documentation/hwmon/pkgtemp
diff --git a/trunk/drivers/hwmon/Kconfig b/trunk/drivers/hwmon/Kconfig
@@ -408,13 +408,6 @@ config SENSORS_CORETEMP
 	  sensor inside your CPU. Most of the family 6 CPUs
 	  are supported. Check Documentation/hwmon/coretemp for details.
 
-config SENSORS_PKGTEMP
-	tristate "Intel processor package temperature sensor"
-	depends on X86 && EXPERIMENTAL
-	help
-	  If you say yes here you get support for the package level temperature
-	  sensor inside your CPU. Check documentation/driver for details.
-
 config SENSORS_IBMAEM
 	tristate "IBM Active Energy Manager temperature/power sensors and control"
 	select IPMI_SI

diff --git a/trunk/drivers/hwmon/Makefile b/trunk/drivers/hwmon/Makefile
@@ -40,7 +40,6 @@ obj-$(CONFIG_SENSORS_APPLESMC)	+= applesmc.o
 obj-$(CONFIG_SENSORS_ASC7621)	+= asc7621.o
 obj-$(CONFIG_SENSORS_ATXP1)	+= atxp1.o
 obj-$(CONFIG_SENSORS_CORETEMP)	+= coretemp.o
-obj-$(CONFIG_SENSORS_PKGTEMP)	+= pkgtemp.o
 obj-$(CONFIG_SENSORS_DME1737)	+= dme1737.o
 obj-$(CONFIG_SENSORS_DS620)	+= ds620.o
 obj-$(CONFIG_SENSORS_DS1621)	+= ds1621.o