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/mpc5200_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/mpc5200_wdt.c')
| -rw-r--r-- | drivers/watchdog/mpc5200_wdt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/watchdog/mpc5200_wdt.c b/drivers/watchdog/mpc5200_wdt.c index db91892558f2..465fe36adad4 100644 --- a/drivers/watchdog/mpc5200_wdt.c +++ b/drivers/watchdog/mpc5200_wdt.c | |||
| @@ -9,8 +9,8 @@ | |||
| 9 | #include <asm/mpc52xx.h> | 9 | #include <asm/mpc52xx.h> |
| 10 | 10 | ||
| 11 | 11 | ||
| 12 | #define GPT_MODE_WDT (1<<15) | 12 | #define GPT_MODE_WDT (1 << 15) |
| 13 | #define GPT_MODE_CE (1<<12) | 13 | #define GPT_MODE_CE (1 << 12) |
| 14 | #define GPT_MODE_MS_TIMER (0x4) | 14 | #define GPT_MODE_MS_TIMER (0x4) |
| 15 | 15 | ||
| 16 | 16 | ||