summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-08-26 13:02:51 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-08-26 13:02:51 -0700
commitc182ae42cc3611f7b3fa803c0bcab6e5d29bea63 (patch)
tree596d908153d92b0b03fe85503eec97852e08640f
parent89a897fbd8c181bfbf814b84fcdce1cd80a3a388 (diff)
parent43ca6cb28c871f2fbad10117b0648e5ae3b0f638 (diff)
downloadlinux-stable-c182ae42cc3611f7b3fa803c0bcab6e5d29bea63.tar.gz
linux-stable-c182ae42cc3611f7b3fa803c0bcab6e5d29bea63.tar.bz2
linux-stable-c182ae42cc3611f7b3fa803c0bcab6e5d29bea63.zip
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull a hwmon fix from Guenter Roeck: "Fix sensor readings for Asus M5A78L in asus_atk0110 driver." * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: hwmon: (asus_atk0110) Add quirk for Asus M5A78L
-rw-r--r--drivers/hwmon/asus_atk0110.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c
index 351d1f4593e7..4ee578948723 100644
--- a/drivers/hwmon/asus_atk0110.c
+++ b/drivers/hwmon/asus_atk0110.c
@@ -34,6 +34,12 @@ static const struct dmi_system_id __initconst atk_force_new_if[] = {
.matches = {
DMI_MATCH(DMI_BOARD_NAME, "SABERTOOTH X58")
}
+ }, {
+ /* Old interface reads the same sensor for fan0 and fan1 */
+ .ident = "Asus M5A78L",
+ .matches = {
+ DMI_MATCH(DMI_BOARD_NAME, "M5A78L")
+ }
},
{ }
};