diff options
| author | Tony Lindgren <tony@atomide.com> | 2015-04-01 12:24:29 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2015-04-01 12:24:29 -0700 |
| commit | 21295368367beaa563b310d5492166dba158b884 (patch) | |
| tree | c8a7c44beff93c040c76788ce2f6f4916281cbd8 /arch/arm/mach-omap2/prm7xx.h | |
| parent | 209431eff8afb928d72200c79153165c7d860ca0 (diff) | |
| parent | ca125b5e31f5ada6844f57c5a8e7cd104d26c8fa (diff) | |
Merge branch '4.0-rc1-prcm-cleanup-v6' of https://github.com/t-kristo/linux-pm into omap-for-v4.1/prcm-cleanup
Conflicts:
arch/arm/boot/dts/dra7.dtsi
Diffstat (limited to 'arch/arm/mach-omap2/prm7xx.h')
| -rw-r--r-- | arch/arm/mach-omap2/prm7xx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/prm7xx.h b/arch/arm/mach-omap2/prm7xx.h index 4bb50fbf29be..cc1e6a2b97f6 100644 --- a/arch/arm/mach-omap2/prm7xx.h +++ b/arch/arm/mach-omap2/prm7xx.h @@ -22,8 +22,8 @@ #ifndef __ARCH_ARM_MACH_OMAP2_PRM7XX_H #define __ARCH_ARM_MACH_OMAP2_PRM7XX_H -#include "prm44xx_54xx.h" #include "prcm-common.h" +#include "prm44xx_54xx.h" #include "prm.h" #define DRA7XX_PRM_BASE 0x4ae06000 |