diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-02-28 23:27:01 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-02-28 23:27:01 +0100 |
| commit | a5bee307ba7befc96a97915d6d45ffbe1e5f9a20 (patch) | |
| tree | 544713c8b4359221df3677fb93a52892c57fbcee /arch/arm/mach-omap2/sdrc2xxx.c | |
| parent | ARM: OMAP: McSPI: Remove unused flag from struct omap2_mcspi_device_config (diff) | |
| parent | ARM: OMAP2+: Limit omap_read/write usage to legacy USB drivers (diff) | |
| download | linux-a5bee307ba7befc96a97915d6d45ffbe1e5f9a20.tar.xz linux-a5bee307ba7befc96a97915d6d45ffbe1e5f9a20.zip | |
Merge branch 'iomap' into cleanup
Diffstat (limited to 'arch/arm/mach-omap2/sdrc2xxx.c')
| -rw-r--r-- | arch/arm/mach-omap2/sdrc2xxx.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/sdrc2xxx.c b/arch/arm/mach-omap2/sdrc2xxx.c index 791a63cdceb2..2c329a6f4778 100644 --- a/arch/arm/mach-omap2/sdrc2xxx.c +++ b/arch/arm/mach-omap2/sdrc2xxx.c @@ -24,13 +24,14 @@ #include <linux/clk.h> #include <linux/io.h> -#include "common.h" #include <plat/clock.h> #include <plat/sram.h> +#include <plat/sdrc.h> +#include "iomap.h" +#include "common.h" #include "prm2xxx_3xxx.h" #include "clock.h" -#include <plat/sdrc.h> #include "sdrc.h" /* Memory timing, DLL mode flags */ |