diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-18 11:59:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-18 11:59:33 -0700 |
| commit | a7571a5c8887b328c0e036fe8cdb60d56809c120 (patch) | |
| tree | 9143a88ff3b999e3e326d94e833b70ed167f9d03 /drivers/watchdog | |
| parent | 78af08d90b8f745044b1274430bc4bc6b2b27aca (diff) | |
| parent | 64e8be6ebdb8212898781fff7722ff2b0eb76131 (diff) | |
| download | linux-a7571a5c8887b328c0e036fe8cdb60d56809c120.tar.gz linux-a7571a5c8887b328c0e036fe8cdb60d56809c120.tar.bz2 linux-a7571a5c8887b328c0e036fe8cdb60d56809c120.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
ARM: Realview & Versatile: Fix i2c_board_info definitions
[ARM] 5608/1: Updated U300 defconfig
[ARM] 5606/1: Fix ep93xx watchdog driver headers
[ARM] 5594/1: Correct U300 VIC init PM setting
[ARM] 5595/1: ep93xx: missing header in dma-m2p.c
[ARM] Kirkwood: Correct header define
[ARM] pxa: fix ULPI_{DIR,NXT,STP} MFP defines
backlight: fix pwm_bl.c to notify platform code when suspending
[ARM] pxa: use kzalloc() in pxa_init_gpio_chip()
[ARM] pxa: correct I2CPWR clock for pxa3xx
pxamci: correct DMA flow control
ARM: add support for the EET board, based on the i.MX31 pcm037 module
pcm037: add MT9T031 camera support
Armadillo 500 add NAND flash device support (resend).
ARM MXC: Armadillo 500 add NOR flash device support (resend).
mx31: remove duplicated #include
Diffstat (limited to 'drivers/watchdog')
| -rw-r--r-- | drivers/watchdog/ep93xx_wdt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/watchdog/ep93xx_wdt.c b/drivers/watchdog/ep93xx_wdt.c index e9f950ff86ea..cdd55e0d09f8 100644 --- a/drivers/watchdog/ep93xx_wdt.c +++ b/drivers/watchdog/ep93xx_wdt.c @@ -29,6 +29,7 @@ #include <linux/watchdog.h> #include <linux/timer.h> #include <linux/uaccess.h> +#include <linux/io.h> #include <mach/hardware.h> #define WDT_VERSION "0.3" |