diff options
| author | Russell King | 2008-11-29 20:35:07 +0100 |
|---|---|---|
| committer | Russell King | 2008-11-29 20:35:07 +0100 |
| commit | fba670013d538719d13f103b2a5b4b06bdca202b (patch) | |
| tree | f7b97d71161a17619e0ba92ffbef5ec2e7823776 /arch/arm/mach-s3c2410/include/mach | |
| 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 | kernel-qcow2-linux-fba670013d538719d13f103b2a5b4b06bdca202b.tar.gz kernel-qcow2-linux-fba670013d538719d13f103b2a5b4b06bdca202b.tar.xz kernel-qcow2-linux-fba670013d538719d13f103b2a5b4b06bdca202b.zip | |
Merge branch 's3c-moves2' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
Diffstat (limited to 'arch/arm/mach-s3c2410/include/mach')
| -rw-r--r-- | arch/arm/mach-s3c2410/include/mach/system-reset.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/system-reset.h b/arch/arm/mach-s3c2410/include/mach/system-reset.h index 43535a0e7186..7613d0a384ba 100644 --- a/arch/arm/mach-s3c2410/include/mach/system-reset.h +++ b/arch/arm/mach-s3c2410/include/mach/system-reset.h @@ -13,7 +13,7 @@ #include <mach/hardware.h> #include <linux/io.h> -#include <asm/plat-s3c/regs-watchdog.h> +#include <plat/regs-watchdog.h> #include <mach/regs-clock.h> #include <linux/clk.h> |