diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-11 18:45:55 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-11 18:45:55 +0100 |
| commit | 6102c315d896fb020550fb2481613485872978f6 (patch) | |
| tree | d0afc2dca7492c65be45af869b5988053bd92f2d /drivers/hwmon/Kconfig | |
| parent | core, x86: make LIST_POISON less deadly (diff) | |
| parent | hwmon: Make PCI device ids constant (diff) | |
| download | linux-6102c315d896fb020550fb2481613485872978f6.tar.xz linux-6102c315d896fb020550fb2481613485872978f6.zip | |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
hwmon: Make PCI device ids constant
hwmon: (coretemp) Fix TjMax for Atom N450/D410/D510 CPUs
hwmon: (k10temp) Blacklist more family 10h processors
hwmon: (asus_atk0110) Add debugfs interface
hwmon: (asus_atk0110) Refactor interface probe code
hwmon: (adt7462) Fix pin 28 monitoring
Diffstat (limited to 'drivers/hwmon/Kconfig')
| -rw-r--r-- | drivers/hwmon/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index 07a0f030a3ec..68cf87749a42 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig @@ -392,7 +392,7 @@ config SENSORS_GL520SM config SENSORS_CORETEMP tristate "Intel Core/Core2/Atom temperature sensor" - depends on X86 && EXPERIMENTAL + depends on X86 && PCI && EXPERIMENTAL help If you say yes here you get support for the temperature sensor inside your CPU. Most of the family 6 CPUs |