diff options
| author | Tony Lindgren <tony@atomide.com> | 2014-05-16 18:26:22 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2014-05-16 18:26:22 -0400 |
| commit | ea351c1603df0607b68eb4663b82ba7a70519d2e (patch) | |
| tree | 3288badcd529986d417c4b999cdba5006f469fd3 /arch/arm/mach-omap2/prm33xx.c | |
| parent | be2d62844819b3536233b7fc726b8f17d9fa7f05 (diff) | |
| parent | 70fcebf1965b66d73bd8ae7955bd663ab8012c56 (diff) | |
Merge tag 'for-v3.16/prcm-cleanup-a' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.16/prcm
Some OMAP PRCM cleanup patches. These help prepare to convert the PRCM
code into drivers.
Basic build, boot, and PM test results are available here:
http://www.pwsan.com/omap/testlogs/prcm-cleanup-v3.16/20140515213244/
Conflicts:
arch/arm/mach-omap2/cm3xxx.c
arch/arm/mach-omap2/cm44xx.c
Also fixed up new section mismatch warnings.
Diffstat (limited to 'arch/arm/mach-omap2/prm33xx.c')
| -rw-r--r-- | arch/arm/mach-omap2/prm33xx.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/prm33xx.c b/arch/arm/mach-omap2/prm33xx.c index 93ba48a7d907..62709cd2f9c5 100644 --- a/arch/arm/mach-omap2/prm33xx.c +++ b/arch/arm/mach-omap2/prm33xx.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/err.h> | 19 | #include <linux/err.h> |
| 20 | #include <linux/io.h> | 20 | #include <linux/io.h> |
| 21 | 21 | ||
| 22 | #include "common.h" | ||
| 23 | #include "powerdomain.h" | 22 | #include "powerdomain.h" |
| 24 | #include "prm33xx.h" | 23 | #include "prm33xx.h" |
| 25 | #include "prm-regbits-33xx.h" | 24 | #include "prm-regbits-33xx.h" |