diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/arm/mach-omap2/sdrc.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/arm/mach-omap2/sdrc.c')
| -rw-r--r-- | arch/arm/mach-omap2/sdrc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/sdrc.c b/arch/arm/mach-omap2/sdrc.c index 4c65f5628b39..da6f3a63b5d5 100644 --- a/arch/arm/mach-omap2/sdrc.c +++ b/arch/arm/mach-omap2/sdrc.c | |||
| @@ -27,8 +27,6 @@ | |||
| 27 | #include <plat/clock.h> | 27 | #include <plat/clock.h> |
| 28 | #include <plat/sram.h> | 28 | #include <plat/sram.h> |
| 29 | 29 | ||
| 30 | #include "prm.h" | ||
| 31 | |||
| 32 | #include <plat/sdrc.h> | 30 | #include <plat/sdrc.h> |
| 33 | #include "sdrc.h" | 31 | #include "sdrc.h" |
| 34 | 32 | ||