diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 22:45:51 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 22:45:51 +0000 |
commit | e5570bbc9c06634cfac94e06ac1432b53d8595e5 (patch) | |
tree | bfaf6b5ddedaa03d31400b25b25cfaa3bd0c9107 /arch/arm/mach-omap2/prcm_mpu44xx.c | |
parent | 5611cc4572e889b62a7b4c72a413536bf6a9c416 (diff) | |
parent | 6cc04a4420391c3f034afe8ea6e28d75912a70a3 (diff) | |
download | linux-e5570bbc9c06634cfac94e06ac1432b53d8595e5.tar.gz |
Merge branch 'for-3.3/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into tegra/soc
Diffstat (limited to 'arch/arm/mach-omap2/prcm_mpu44xx.c')
-rw-r--r-- | arch/arm/mach-omap2/prcm_mpu44xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/prcm_mpu44xx.c b/arch/arm/mach-omap2/prcm_mpu44xx.c index 171fe171a749..ca669b50f390 100644 --- a/arch/arm/mach-omap2/prcm_mpu44xx.c +++ b/arch/arm/mach-omap2/prcm_mpu44xx.c @@ -15,7 +15,7 @@ #include <linux/err.h> #include <linux/io.h> -#include <plat/common.h> +#include "common.h" #include "prcm_mpu44xx.h" #include "cm-regbits-44xx.h" |