Merge branch 'x86-hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, hwmon: Package Level Thermal/Power: pkgtemp documentation
  x86, hwmon: Package Level Thermal/Power: power limit
  x86, hwmon: Package Level Thermal/Power: thermal throttling handler
  x86, hwmon: Package Level Thermal/Power: pkgtemp hwmon driver

1 files changed, 7 insertions, 0 deletions

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index c57e530d07c7..4d382ae53092 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -407,6 +407,13 @@ config SENSORS_CORETEMP
           sensor inside your CPU. Most of the family 6 CPUs
           are supported. Check documentation/driver for details.
 
+config SENSORS_PKGTEMP
+        tristate "Intel processor package temperature sensor"
+        depends on X86 && PCI && 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