diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-25 02:05:59 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-25 02:05:59 +0200 |
| commit | 8634155ef41d3a035f2ea0b6c5bed2806f2788bc (patch) | |
| tree | 6334a630abf196685803f17002fbf25d11babe17 /arch/arm/mach-omap2/pm34xx.c | |
| parent | Merge branch 'omap-for-v3.8/cleanup-headers-usb' into omap-for-v3.8/cleanup-h... (diff) | |
| parent | ARM: OMAP2+: PRM: create PRM reset source API for the watchdog timer driver (diff) | |
| download | linux-8634155ef41d3a035f2ea0b6c5bed2806f2788bc.tar.xz linux-8634155ef41d3a035f2ea0b6c5bed2806f2788bc.zip | |
Merge tag 'omap-cleanup-a-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.8/cleanup-prcm
The first set of OMAP PRM/CM-related cleanup patches for 3.8.
Prepares for the future move of the PRM/CM code to drivers/. Also
includes some prcm.[ch] cleanup patches from the WDTIMER cleanup
series that don't need external acks.
Basic test logs for this branch on top of v3.7-rc2 are here:
http://www.pwsan.com/omap/testlogs/prcm_cleanup_a_3.8/20121021123719/
But due to the number of unrelated regressions present in v3.7-rc[12],
it's not particularly usable as a testing base. With reverts, fixes,
and workarounds applied as documented in:
http://www.pwsan.com/omap/testlogs/test_v3.7-rc2/20121020134755/README.txt
the following test logs were obtained:
http://www.pwsan.com/omap/testlogs/prcm_cleanup_a_3.8/20121020231757/
which indicate that the series tests cleanly.
Conflicts:
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/clockdomain2xxx_3xxx.c
arch/arm/mach-omap2/pm24xx.c
Diffstat (limited to 'arch/arm/mach-omap2/pm34xx.c')
| -rw-r--r-- | arch/arm/mach-omap2/pm34xx.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index 160fa250c41e..2f1ad87c1bb0 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -44,12 +44,11 @@ #include "soc.h" #include "common.h" -#include "cm2xxx_3xxx.h" +#include "cm3xxx.h" #include "cm-regbits-34xx.h" #include "gpmc.h" #include "prm-regbits-34xx.h" - -#include "prm2xxx_3xxx.h" +#include "prm3xxx.h" #include "pm.h" #include "sdrc.h" #include "control.h" |