diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-21 00:16:30 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-21 00:16:30 -0400 |
| commit | b74aae9a2074e1caa2e40bf119f3a633f77c94e4 (patch) | |
| tree | ba465514cff017a3213e65556674c68be5db29f6 /arch/arm/mach-omap1/pm.c | |
| parent | 5698bd757d55b1bb87edd1a9744ab09c142abfc2 (diff) | |
| parent | b97ba3ab4e8ec88164a47c98c91955e90ecd7c6a (diff) | |
Merge branch 'next/cleanup' into next/multiplatform
* next/cleanup: (358 commits)
ARM: tegra: harmony: fix ldo7 regulator-name
ARM: OMAP2+: Make omap4-keypad.h local
ARM: OMAP2+: Make l4_3xxx.h local
ARM: OMAP2+: Make l4_2xxx.h local
ARM: OMAP2+: Make l3_3xxx.h local
ARM: OMAP2+: Make l3_2xxx.h local
ARM: OMAP1: Move irda.h from plat to mach
ARM: OMAP2+: Make hdq1w.h local
ARM: OMAP2+: Make gpmc-smsc911x.h local
ARM: OMAP2+: Make gpmc-smc91x.h local
ARM: OMAP1: Move flash.h from plat to mach
ARM: OMAP2+: Make debug-devices.h local
ARM: OMAP1: Move board-voiceblue.h from plat to mach
ARM: OMAP1: Move board-sx1.h from plat to mach
ARM: OMAP2+: Make omap-wakeupgen.h local
ARM: OMAP2+: Make omap-secure.h local
ARM: OMAP2+: Make ctrl_module_wkup_44xx.h local
ARM: OMAP2+: Make ctrl_module_pad_wkup_44xx.h local
ARM: OMAP2+: Make ctrl_module_pad_core_44xx.h local
ARM: OMAP2+: Make ctrl_module_core_44xx.h local
...
Diffstat (limited to 'arch/arm/mach-omap1/pm.c')
| -rw-r--r-- | arch/arm/mach-omap1/pm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c index b2560d32b3a..47ec1615548 100644 --- a/arch/arm/mach-omap1/pm.c +++ b/arch/arm/mach-omap1/pm.c | |||
| @@ -53,7 +53,7 @@ | |||
| 53 | #include <plat/clock.h> | 53 | #include <plat/clock.h> |
| 54 | #include <plat/sram.h> | 54 | #include <plat/sram.h> |
| 55 | #include <plat/tc.h> | 55 | #include <plat/tc.h> |
| 56 | #include <plat/mux.h> | 56 | #include <mach/mux.h> |
| 57 | #include <plat/dma.h> | 57 | #include <plat/dma.h> |
| 58 | #include <plat/dmtimer.h> | 58 | #include <plat/dmtimer.h> |
| 59 | 59 | ||