diff options
author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-01-06 16:53:54 +0400 |
---|---|---|
committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-01-06 16:53:54 +0400 |
commit | 01deeef1e25035bbaca9bc580c88dc7cdbc85363 (patch) | |
tree | 1994c9cede5c10eb07f53ecf76f2afcedd1e0c13 /arch/arm/mach-omap2/vp3xxx_data.c | |
parent | 805a6af8dba5dfdd35ec35dc52ec0122400b2610 (diff) | |
parent | ef3a0bf5bfadbace156fa2a3b9c753df2de41df2 (diff) |
Merge branch 'rmk-devel-stable' into linux-linaro-tracking
Conflicts:
arch/arm/kernel/setup.c
arch/arm/mach-shmobile/board-kota2.c
Diffstat (limited to 'arch/arm/mach-omap2/vp3xxx_data.c')
-rw-r--r-- | arch/arm/mach-omap2/vp3xxx_data.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/vp3xxx_data.c b/arch/arm/mach-omap2/vp3xxx_data.c index 260c554b154..bd89f80089f 100644 --- a/arch/arm/mach-omap2/vp3xxx_data.c +++ b/arch/arm/mach-omap2/vp3xxx_data.c @@ -19,7 +19,7 @@ #include <linux/err.h> #include <linux/init.h> -#include <plat/common.h> +#include "common.h" #include "prm-regbits-34xx.h" #include "voltage.h" |