diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-29 20:35:07 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-29 20:35:07 +0100 |
commit | fba670013d538719d13f103b2a5b4b06bdca202b (patch) | |
tree | f7b97d71161a17619e0ba92ffbef5ec2e7823776 /drivers/watchdog | |
parent | [ARM] give RiscPC a NR_IRQS definition and remove default (diff) | |
parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval... (diff) | |
download | linux-fba670013d538719d13f103b2a5b4b06bdca202b.tar.xz linux-fba670013d538719d13f103b2a5b4b06bdca202b.zip |
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 @@ #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: " |