diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-10-31 12:34:49 +0000 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-10-31 12:34:49 +0000 |
| commit | ebfa200c1c2d8a0a0634ebd7a24123f9a0404a5c (patch) | |
| tree | 43d56e5f04108cd9768a87b95df85db3bc3659ca /arch/arm/mach-s3c2410/include/mach | |
| parent | 2231b3729eb92f163bbe64b604410ee451b2c42b (diff) | |
| parent | e3bd9ec5d8bfc90f9e1bd995677829e57a404061 (diff) | |
Merge branch 's3c-moves2' into s3c64xx
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 43535a0e718..7613d0a384b 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> |