diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2010-08-06 21:34:55 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-08-06 21:34:55 +0900 |
| commit | f2b7e3c54a304677a1142829fb5913595885379f (patch) | |
| tree | 1eb941524c7325672f947dab525d96228b362e20 /arch/arm/mach-s5p6440/include | |
| parent | 6b8eda04ffdc24b68d379a32358f4f09a425a380 (diff) | |
| parent | 0fdb480e7fb1ecdd4076ddf8b6ab16b0d77406c1 (diff) | |
| download | blackbird-op-linux-f2b7e3c54a304677a1142829fb5913595885379f.tar.gz blackbird-op-linux-f2b7e3c54a304677a1142829fb5913595885379f.zip | |
Merge branch 'next-s5p' into for-next
Conflicts:
arch/arm/mach-s5pv210/mach-aquila.c
arch/arm/mach-s5pv210/mach-goni.c
Diffstat (limited to 'arch/arm/mach-s5p6440/include')
| -rw-r--r-- | arch/arm/mach-s5p6440/include/mach/irqs.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s5p6440/include/mach/system.h | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/arch/arm/mach-s5p6440/include/mach/irqs.h b/arch/arm/mach-s5p6440/include/mach/irqs.h index 911854d9ad42..16a761270de1 100644 --- a/arch/arm/mach-s5p6440/include/mach/irqs.h +++ b/arch/arm/mach-s5p6440/include/mach/irqs.h @@ -51,7 +51,7 @@ #define IRQ_DISPCON3 S5P_IRQ_VIC1(19) #define IRQ_FIMGVG S5P_IRQ_VIC1(20) #define IRQ_EINT_GROUPS S5P_IRQ_VIC1(21) -#define IRQ_PMUIRQ S5P_IRQ_VIC1(23) +#define IRQ_PMU S5P_IRQ_VIC1(23) #define IRQ_HSMMC0 S5P_IRQ_VIC1(24) #define IRQ_HSMMC1 S5P_IRQ_VIC1(25) #define IRQ_HSMMC2 IRQ_SPI1 /* shared with SPI1 */ diff --git a/arch/arm/mach-s5p6440/include/mach/system.h b/arch/arm/mach-s5p6440/include/mach/system.h index d2dd817da66a..a359ee3fa510 100644 --- a/arch/arm/mach-s5p6440/include/mach/system.h +++ b/arch/arm/mach-s5p6440/include/mach/system.h @@ -13,12 +13,9 @@ #ifndef __ASM_ARCH_SYSTEM_H #define __ASM_ARCH_SYSTEM_H __FILE__ -static void arch_idle(void) -{ - /* nothing here yet */ -} +#include <plat/system-reset.h> -static void arch_reset(char mode, const char *cmd) +static void arch_idle(void) { /* nothing here yet */ } |
