diff options
| author | Tony Lindgren <tony@atomide.com> | 2014-05-16 15:26:22 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2014-05-16 15:26:22 -0700 |
| commit | ea351c1603df0607b68eb4663b82ba7a70519d2e (patch) | |
| tree | 3288badcd529986d417c4b999cdba5006f469fd3 /arch/arm/mach-omap2/cm_common.c | |
| parent | be2d62844819b3536233b7fc726b8f17d9fa7f05 (diff) | |
| parent | 70fcebf1965b66d73bd8ae7955bd663ab8012c56 (diff) | |
| download | linux-ea351c1603df0607b68eb4663b82ba7a70519d2e.tar.bz2 | |
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/cm_common.c')
| -rw-r--r-- | arch/arm/mach-omap2/cm_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/cm_common.c b/arch/arm/mach-omap2/cm_common.c index 40b3b5a84458..8f6c4710877e 100644 --- a/arch/arm/mach-omap2/cm_common.c +++ b/arch/arm/mach-omap2/cm_common.c @@ -14,11 +14,11 @@ #include <linux/kernel.h> #include <linux/init.h> #include <linux/errno.h> +#include <linux/bug.h> #include "cm2xxx.h" #include "cm3xxx.h" #include "cm44xx.h" -#include "common.h" /* * cm_ll_data: function pointers to SoC-specific implementations of |