diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-10-08 11:10:36 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-10-08 11:10:36 -0700 |
| commit | a7c887510073b2f403e123f2befa40bf93554df9 (patch) | |
| tree | afee0628d0688bb2460cfd4eb1ee4cc8281e925c /arch/arm/mach-omap2/prcm.c | |
| parent | 4415beb6fb519c4e98491666838494a8c46cc3ee (diff) | |
| parent | 4367260c0bc1773c00b2309a31b31657cabfda3f (diff) | |
| download | kernel_samsung_smdk4412-a7c887510073b2f403e123f2befa40bf93554df9.zip kernel_samsung_smdk4412-a7c887510073b2f403e123f2befa40bf93554df9.tar.gz kernel_samsung_smdk4412-a7c887510073b2f403e123f2befa40bf93554df9.tar.bz2 | |
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/prcm.c')
| -rw-r--r-- | arch/arm/mach-omap2/prcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c index a48a1e2..a51846e 100644 --- a/arch/arm/mach-omap2/prcm.c +++ b/arch/arm/mach-omap2/prcm.c @@ -26,7 +26,6 @@ #include <plat/common.h> #include <plat/prcm.h> #include <plat/irqs.h> -#include <plat/control.h> #include "clock.h" #include "clock2xxx.h" @@ -34,6 +33,7 @@ #include "prm.h" #include "prm-regbits-24xx.h" #include "prm-regbits-44xx.h" +#include "control.h" static void __iomem *prm_base; static void __iomem *cm_base; |