diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-26 12:36:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-26 12:36:19 -0400 |
| commit | b1cd2ee3b95f1c3108c68c82342c614e58ce1f13 (patch) | |
| tree | f282632a4cd5de359c8ba586371e907ade0543ec /drivers/hwmon/w83781d.c | |
| parent | e383d56487062275e9971094f2efcca34227ee60 (diff) | |
| parent | c02d65694debbc82dc48453a9fd52efb036c7258 (diff) | |
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) enable DMI probing feature on AW9D-MAX
hwmon: (abituguru3) Cosmetic whitespace fixes
hwmon: (adt7473) Fix voltage conversion routines
hwmon: (lm90) Add support for the LM99 16 degree offset
hwmon: (lm90) Fix handling of hysteresis value
hwmon-vid: Add support for AMD family 10h CPUs
hwmon: (w83781d) Fix linking when built-in
Diffstat (limited to 'drivers/hwmon/w83781d.c')
| -rw-r--r-- | drivers/hwmon/w83781d.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c index d4d1b859d4f1..fc12bd412e3a 100644 --- a/drivers/hwmon/w83781d.c +++ b/drivers/hwmon/w83781d.c | |||
| @@ -1968,7 +1968,7 @@ exit: | |||
| 1968 | return res; | 1968 | return res; |
| 1969 | } | 1969 | } |
| 1970 | 1970 | ||
| 1971 | static void __exit | 1971 | static void |
| 1972 | w83781d_isa_unregister(void) | 1972 | w83781d_isa_unregister(void) |
| 1973 | { | 1973 | { |
| 1974 | if (pdev) { | 1974 | if (pdev) { |
| @@ -2017,7 +2017,7 @@ w83781d_isa_register(void) | |||
| 2017 | return 0; | 2017 | return 0; |
| 2018 | } | 2018 | } |
| 2019 | 2019 | ||
| 2020 | static void __exit | 2020 | static void |
| 2021 | w83781d_isa_unregister(void) | 2021 | w83781d_isa_unregister(void) |
| 2022 | { | 2022 | { |
| 2023 | } | 2023 | } |