diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-24 11:36:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-24 11:36:41 -0400 |
| commit | 6ae85d6db4871d8dbcb5cc0e9056f97f1ca07061 (patch) | |
| tree | d0a6fa2e4fcef36a4c80990a361c0d5fbe091c35 /drivers/watchdog/orion5x_wdt.c | |
| parent | d72cd3a90e4d6725b62919139e2ab7bd926fa16d (diff) | |
| parent | fdd8b079e33d4711527ace19798e9db99a056469 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 5460/1: Orion: reduce namespace pollution
[ARM] 5458/1: pcmcia: pxa2xx-sharpsl: check if we do have Scoop config
[ARM] 5457/1: mach-imx gpio buildfix
[ARM] 5456/1: add sys_preadv and sys_pwritev
[ARM] pxa/pcm990: start external GPIOs immediately after built-in ones
[ARM] pxa/palm27x: General fix for Palm27x aSoC driver
[ARM] pxa/mioa701: use GPIO95 as AC97 reset line
[ARM] pxa: merge AC97 platform data structures
[ARM] pxa/magician: remove un-necessary #include of pxa-regs.h and hardware.h
Diffstat (limited to 'drivers/watchdog/orion5x_wdt.c')
| -rw-r--r-- | drivers/watchdog/orion5x_wdt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/watchdog/orion5x_wdt.c b/drivers/watchdog/orion5x_wdt.c index 7529616739d2..2cde568e4fb0 100644 --- a/drivers/watchdog/orion5x_wdt.c +++ b/drivers/watchdog/orion5x_wdt.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/uaccess.h> | 22 | #include <linux/uaccess.h> |
| 23 | #include <linux/io.h> | 23 | #include <linux/io.h> |
| 24 | #include <linux/spinlock.h> | 24 | #include <linux/spinlock.h> |
| 25 | #include <mach/bridge-regs.h> | ||
| 25 | #include <plat/orion5x_wdt.h> | 26 | #include <plat/orion5x_wdt.h> |
| 26 | 27 | ||
| 27 | /* | 28 | /* |