diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-06 22:39:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-06 22:39:31 -0400 |
| commit | 69259abb64d4da77273bf59accfc9fa79e7165f4 (patch) | |
| tree | bd043ab03a788b749c8d5ae4049d8defae9abf34 /drivers/hwmon/w83627ehf.c | |
| parent | dd53df265b1ee7a1fbbc76bb62c3bec2383bbd44 (diff) | |
| parent | 12e94471b2be5ef9b55b10004a3a2cd819490036 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/pcmcia/pcnet_cs.c
net/caif/caif_socket.c
Diffstat (limited to 'drivers/hwmon/w83627ehf.c')
| -rw-r--r-- | drivers/hwmon/w83627ehf.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c index e96e69dd36f..072c58008a6 100644 --- a/drivers/hwmon/w83627ehf.c +++ b/drivers/hwmon/w83627ehf.c | |||
| @@ -127,6 +127,7 @@ superio_enter(int ioreg) | |||
| 127 | static inline void | 127 | static inline void |
| 128 | superio_exit(int ioreg) | 128 | superio_exit(int ioreg) |
| 129 | { | 129 | { |
| 130 | outb(0xaa, ioreg); | ||
| 130 | outb(0x02, ioreg); | 131 | outb(0x02, ioreg); |
| 131 | outb(0x02, ioreg + 1); | 132 | outb(0x02, ioreg + 1); |
| 132 | } | 133 | } |