diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-10-08 14:10:36 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-10-08 14:10:36 -0400 |
| commit | a7c887510073b2f403e123f2befa40bf93554df9 (patch) | |
| tree | afee0628d0688bb2460cfd4eb1ee4cc8281e925c /arch/arm/mach-omap2/pm34xx.c | |
| parent | 4415beb6fb519c4e98491666838494a8c46cc3ee (diff) | |
| parent | 4367260c0bc1773c00b2309a31b31657cabfda3f (diff) | |
Merge branch 'control_mcbsp_fix_2.6.37' of git://git.pwsan.com/linux-2.6 into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/pm34xx.c')
| -rw-r--r-- | arch/arm/mach-omap2/pm34xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index e57c9aeeefe0..8c8f1acd3526 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | #include <plat/sram.h> | 32 | #include <plat/sram.h> |
| 33 | #include <plat/clockdomain.h> | 33 | #include <plat/clockdomain.h> |
| 34 | #include <plat/powerdomain.h> | 34 | #include <plat/powerdomain.h> |
| 35 | #include <plat/control.h> | ||
| 36 | #include <plat/serial.h> | 35 | #include <plat/serial.h> |
| 37 | #include <plat/sdrc.h> | 36 | #include <plat/sdrc.h> |
| 38 | #include <plat/prcm.h> | 37 | #include <plat/prcm.h> |
| @@ -48,6 +47,7 @@ | |||
| 48 | #include "prm.h" | 47 | #include "prm.h" |
| 49 | #include "pm.h" | 48 | #include "pm.h" |
| 50 | #include "sdrc.h" | 49 | #include "sdrc.h" |
| 50 | #include "control.h" | ||
| 51 | 51 | ||
| 52 | /* Scratchpad offsets */ | 52 | /* Scratchpad offsets */ |
| 53 | #define OMAP343X_TABLE_ADDRESS_OFFSET 0x31 | 53 | #define OMAP343X_TABLE_ADDRESS_OFFSET 0x31 |