diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-28 06:42:12 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-28 06:42:12 +0400 |
commit | 1680a013b4ef5c5a6aea239d08042652ea65e759 (patch) | |
tree | c249a7eb2f508ba59a73ce566e64750b8e6b5400 /drivers/hwmon/Kconfig | |
parent | a17d47300b4042a3893217c0c3f2d806fe1faa3b (diff) | |
parent | a66c10887ad2a99e172111cc94087ba4bed8fa92 (diff) | |
download | linux-1680a013b4ef5c5a6aea239d08042652ea65e759.tar.xz |
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: (f71882fg) Add support for the F71889A
hwmon: (f71882fg) Add support for the F81865F
hwmon: (f71882fg) Document all supported devices
hwmon: (f71882fg) Per-chip fan/temperature input count tables
hwmon: (f71882fg) Secure chip property definition arrays
Diffstat (limited to 'drivers/hwmon/Kconfig')
-rw-r--r-- | drivers/hwmon/Kconfig | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index 81131eda5544..060ef6327876 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig @@ -315,11 +315,22 @@ config SENSORS_F71805F will be called f71805f. config SENSORS_F71882FG - tristate "Fintek F71858FG, F71862FG, F71882FG, F71889FG and F8000" + tristate "Fintek F71882FG and compatibles" help If you say yes here you get support for hardware monitoring - features of the Fintek F71858FG, F71862FG/71863FG, F71882FG/F71883FG, - F71889FG and F8000 Super-I/O chips. + features of many Fintek Super-I/O (LPC) chips. The currently + supported chips are: + F71808E + F71858FG + F71862FG + F71863FG + F71869F/E + F71882FG + F71883FG + F71889FG/ED/A + F8000 + F81801U + F81865F This driver can also be built as a module. If so, the module will be called f71882fg. |