diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-29 23:04:53 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-29 23:04:53 -0400 |
| commit | 9ff9a26b786c35ee8d2a66222924a807ec851a9f (patch) | |
| tree | db432a17bccca1ca2c16907f0ee83ac449ed4012 /drivers/watchdog/it87_wdt.c | |
| parent | 0a3108beea9143225119d5e7c72a8e2c64f3eb7d (diff) | |
| parent | 0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b (diff) | |
Merge commit 'origin/master' into next
Manual merge of:
arch/powerpc/include/asm/elf.h
drivers/i2c/busses/i2c-mpc.c
Diffstat (limited to 'drivers/watchdog/it87_wdt.c')
| -rw-r--r-- | drivers/watchdog/it87_wdt.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/watchdog/it87_wdt.c b/drivers/watchdog/it87_wdt.c index afb8af397a9f..cc133c531d08 100644 --- a/drivers/watchdog/it87_wdt.c +++ b/drivers/watchdog/it87_wdt.c | |||
| @@ -188,8 +188,8 @@ static inline int superio_inb(int reg) | |||
| 188 | 188 | ||
| 189 | static inline void superio_outb(int val, int reg) | 189 | static inline void superio_outb(int val, int reg) |
| 190 | { | 190 | { |
| 191 | outb(reg, REG); | 191 | outb(reg, REG); |
| 192 | outb(val, VAL); | 192 | outb(val, VAL); |
| 193 | } | 193 | } |
| 194 | 194 | ||
| 195 | static inline int superio_inw(int reg) | 195 | static inline int superio_inw(int reg) |
| @@ -204,10 +204,10 @@ static inline int superio_inw(int reg) | |||
| 204 | 204 | ||
| 205 | static inline void superio_outw(int val, int reg) | 205 | static inline void superio_outw(int val, int reg) |
| 206 | { | 206 | { |
| 207 | outb(reg++, REG); | 207 | outb(reg++, REG); |
| 208 | outb(val >> 8, VAL); | 208 | outb(val >> 8, VAL); |
| 209 | outb(reg, REG); | 209 | outb(reg, REG); |
| 210 | outb(val, VAL); | 210 | outb(val, VAL); |
| 211 | } | 211 | } |
| 212 | 212 | ||
| 213 | /* watchdog timer handling */ | 213 | /* watchdog timer handling */ |