diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-29 14:35:07 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-29 14:35:07 -0500 |
| commit | fba670013d538719d13f103b2a5b4b06bdca202b (patch) | |
| tree | f7b97d71161a17619e0ba92ffbef5ec2e7823776 /drivers/watchdog | |
| parent | 7577fdfa52438a19e7e8abedb6efc645986af2ae (diff) | |
| parent | e856359685143a2f65876e7db4e4aa0ef5dce7f0 (diff) | |
Merge branch 's3c-moves2' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
Diffstat (limited to 'drivers/watchdog')
| -rw-r--r-- | drivers/watchdog/s3c2410_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c index f7f6ce82a5e2..e31925ee8346 100644 --- a/drivers/watchdog/s3c2410_wdt.c +++ b/drivers/watchdog/s3c2410_wdt.c | |||
| @@ -42,7 +42,7 @@ | |||
| 42 | #undef S3C_VA_WATCHDOG | 42 | #undef S3C_VA_WATCHDOG |
| 43 | #define S3C_VA_WATCHDOG (0) | 43 | #define S3C_VA_WATCHDOG (0) |
| 44 | 44 | ||
| 45 | #include <asm/plat-s3c/regs-watchdog.h> | 45 | #include <plat/regs-watchdog.h> |
| 46 | 46 | ||
| 47 | #define PFX "s3c2410-wdt: " | 47 | #define PFX "s3c2410-wdt: " |
| 48 | 48 | ||