diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-15 16:40:12 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-15 16:40:12 -0800 |
commit | 7e92214b539ea17ccaf0886d140cbba9801a4d40 (patch) | |
tree | 5a678acfca63f485fd02c83932ffcfa486657650 /drivers/hwmon/Kconfig | |
parent | 6364853dabe78dda7ffdfb8803c1e56c0fff2e43 (diff) | |
parent | 46a5f173fc88ffc22651162033696d8a9fbcdc5c (diff) | |
download | blackbird-op-linux-7e92214b539ea17ccaf0886d140cbba9801a4d40.tar.gz blackbird-op-linux-7e92214b539ea17ccaf0886d140cbba9801a4d40.zip |
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:
hwmon: (abituguru3) Fix CONFIG_DMI=n fallback to probe
hwmon: (abituguru3) Enable DMI probing feature on IN9 32X MAX
hwmon: (abituguru3) Match partial DMI board name strings
hwmon: Add a driver for the ADT7475 hardware monitoring chip
hwmon: (k8temp) Fix temperature reporting for (most) K8 RevG CPUs
hwmon: (k8temp) Fix wrong sensor selection for AMD K8 RevF/RevG CPUs
hwmon: (k8temp) Warn about fam F rev F errata
Diffstat (limited to 'drivers/hwmon/Kconfig')
-rw-r--r-- | drivers/hwmon/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index 54b43bea5e47..b84bf066879b 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig @@ -189,6 +189,16 @@ config SENSORS_ADT7473 This driver can also be built as a module. If so, the module will be called adt7473. +config SENSORS_ADT7475 + tristate "Analog Devices ADT7475" + depends on I2C && EXPERIMENTAL + help + If you say yes here you get support for the Analog Devices + ADT7475 hardware monitoring chips. + + This driver can also be build as a module. If so, the module + will be called adt7475. + config SENSORS_K8TEMP tristate "AMD Athlon64/FX or Opteron temperature sensor" depends on X86 && PCI && EXPERIMENTAL |