diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-17 14:21:34 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-17 14:21:34 -0400 |
| commit | 6832c95599e1a04f4b56b533718d1cda4689aec2 (patch) | |
| tree | 3faf1a2a744245501c1743c909527d83bbb6666a /arch/arm/mach-omap2/io.c | |
| parent | 46cddc01aa6a017193ae7320ef8bfc8242782a66 (diff) | |
| parent | 3e6ece13d966a20a38ee7adfac452a47455ccd7a (diff) | |
Merge branch 'omap-for-v3.8/cleanup-headers-dss' into omap-for-v3.8/cleanup-headers
Conflicts:
arch/arm/mach-omap2/board-omap3logic.c
arch/arm/mach-omap2/gpmc.c
drivers/media/platform/omap/omap_vout.c
drivers/media/platform/omap/omap_vout_vrfb.c
Diffstat (limited to 'arch/arm/mach-omap2/io.c')
| -rw-r--r-- | arch/arm/mach-omap2/io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 42a4b9c08aaa..f71e51bfbe2a 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | #include <asm/mach/map.h> | 26 | #include <asm/mach/map.h> |
| 27 | 27 | ||
| 28 | #include <plat/sram.h> | 28 | #include <plat/sram.h> |
| 29 | #include <plat/sdrc.h> | ||
| 30 | #include <plat/serial.h> | 29 | #include <plat/serial.h> |
| 31 | #include <plat/omap-pm.h> | 30 | #include <plat/omap-pm.h> |
| 32 | #include <plat/omap_hwmod.h> | 31 | #include <plat/omap_hwmod.h> |
| @@ -43,6 +42,7 @@ | |||
| 43 | #include "clock2xxx.h" | 42 | #include "clock2xxx.h" |
| 44 | #include "clock3xxx.h" | 43 | #include "clock3xxx.h" |
| 45 | #include "clock44xx.h" | 44 | #include "clock44xx.h" |
| 45 | #include "sdrc.h" | ||
| 46 | 46 | ||
| 47 | /* | 47 | /* |
| 48 | * The machine specific code may provide the extra mapping besides the | 48 | * The machine specific code may provide the extra mapping besides the |