diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-29 19:35:07 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-29 19:35:07 +0000 |
commit | fba670013d538719d13f103b2a5b4b06bdca202b (patch) | |
tree | f7b97d71161a17619e0ba92ffbef5ec2e7823776 /drivers/watchdog | |
parent | 7577fdfa52438a19e7e8abedb6efc645986af2ae (diff) | |
parent | e856359685143a2f65876e7db4e4aa0ef5dce7f0 (diff) | |
download | op-kernel-dev-fba670013d538719d13f103b2a5b4b06bdca202b.zip op-kernel-dev-fba670013d538719d13f103b2a5b4b06bdca202b.tar.gz |
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 f7f6ce8..e31925e 100644 --- a/drivers/watchdog/s3c2410_wdt.c +++ b/drivers/watchdog/s3c2410_wdt.c @@ -42,7 +42,7 @@ #undef S3C_VA_WATCHDOG #define S3C_VA_WATCHDOG (0) -#include <asm/plat-s3c/regs-watchdog.h> +#include <plat/regs-watchdog.h> #define PFX "s3c2410-wdt: " |