diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 11:01:00 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 11:01:00 -0500 |
| commit | a07613a54d700a974f3a4a657da78ef5d097315d (patch) | |
| tree | e4bc91713e02fa6d8f08b07de53ea8f905593dfa /arch/arm/mach-omap2/pm24xx.c | |
| parent | 65db039bf7402f0a5b19cbf6dcff55ebea433b8b (diff) | |
| parent | 928a11ba36f999436915ea2b1eadf54301f93059 (diff) | |
Merge branch 'samsung/dt' into samsung/cleanup
Conflicts:
arch/arm/mach-s3c64xx/Makefile
arch/arm/mach-s5pc100/Makefile
arch/arm/mach-s5pv210/Makefile
Pull in previously resolved conflicts:
The Makefiles were reorganized in the "rmk/restart" series and modified
in the "samsung/cleanup series". This also pulls in the other conflict
resolutions from the restart series against the samsung/dt series.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-omap2/pm24xx.c')
| -rw-r--r-- | arch/arm/mach-omap2/pm24xx.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/pm24xx.c b/arch/arm/mach-omap2/pm24xx.c index cf0c216132a..ef8595c8029 100644 --- a/arch/arm/mach-omap2/pm24xx.c +++ b/arch/arm/mach-omap2/pm24xx.c | |||
| @@ -42,6 +42,7 @@ | |||
| 42 | #include <plat/dma.h> | 42 | #include <plat/dma.h> |
| 43 | #include <plat/board.h> | 43 | #include <plat/board.h> |
| 44 | 44 | ||
| 45 | #include "common.h" | ||
| 45 | #include "prm2xxx_3xxx.h" | 46 | #include "prm2xxx_3xxx.h" |
| 46 | #include "prm-regbits-24xx.h" | 47 | #include "prm-regbits-24xx.h" |
| 47 | #include "cm2xxx_3xxx.h" | 48 | #include "cm2xxx_3xxx.h" |