diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 11:31:45 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 11:31:45 -0400 |
| commit | 66a2886d867343eff6bf2646bea2c923d0cbf620 (patch) | |
| tree | ad44dcca4fa410ab2c16b4964f6c19571421b4df /arch/arm/plat-spear/restart.c | |
| parent | d2819f80d465672b09c2f4cb52303b7f951c4d0f (diff) | |
| parent | f613e220aebfafb653f7ce264950c15c99e27f2a (diff) | |
Merge branch 'spear/dt' into spear/clock
Conflicts:
arch/arm/mach-spear3xx/clock.c
arch/arm/mach-spear3xx/include/mach/generic.h
arch/arm/mach-spear3xx/include/mach/misc_regs.h
arch/arm/mach-spear3xx/spear320.c
arch/arm/mach-spear6xx/clock.c
arch/arm/mach-spear6xx/include/mach/misc_regs.h
Resolve even more merge conflicts.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/plat-spear/restart.c')
| -rw-r--r-- | arch/arm/plat-spear/restart.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-spear/restart.c b/arch/arm/plat-spear/restart.c index 16f203e78d89..4471a232713a 100644 --- a/arch/arm/plat-spear/restart.c +++ b/arch/arm/plat-spear/restart.c | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | #include <linux/io.h> | 13 | #include <linux/io.h> |
| 14 | #include <asm/system_misc.h> | 14 | #include <asm/system_misc.h> |
| 15 | #include <asm/hardware/sp810.h> | 15 | #include <asm/hardware/sp810.h> |
| 16 | #include <mach/hardware.h> | 16 | #include <mach/spear.h> |
| 17 | #include <mach/generic.h> | 17 | #include <mach/generic.h> |
| 18 | 18 | ||
| 19 | void spear_restart(char mode, const char *cmd) | 19 | void spear_restart(char mode, const char *cmd) |