diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-02-28 14:27:01 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-02-28 14:27:01 -0800 |
| commit | a5bee307ba7befc96a97915d6d45ffbe1e5f9a20 (patch) | |
| tree | 544713c8b4359221df3677fb93a52892c57fbcee /arch/arm/mach-omap1/flash.c | |
| parent | 0aac881246fb25d017617cd7be68e93326d51ce1 (diff) | |
| parent | acea7c7b81e8f67513aebade8cb99c7789c44d8c (diff) | |
| download | op-kernel-dev-a5bee307ba7befc96a97915d6d45ffbe1e5f9a20.zip op-kernel-dev-a5bee307ba7befc96a97915d6d45ffbe1e5f9a20.tar.gz | |
Merge branch 'iomap' into cleanup
Diffstat (limited to 'arch/arm/mach-omap1/flash.c')
| -rw-r--r-- | arch/arm/mach-omap1/flash.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/flash.c b/arch/arm/mach-omap1/flash.c index 1749cb3..f9bf78d4 100644 --- a/arch/arm/mach-omap1/flash.c +++ b/arch/arm/mach-omap1/flash.c @@ -6,13 +6,15 @@ * published by the Free Software Foundation. */ +#include <linux/io.h> #include <linux/mtd/mtd.h> #include <linux/mtd/map.h> -#include <plat/io.h> #include <plat/tc.h> #include <plat/flash.h> +#include <mach/hardware.h> + void omap1_set_vpp(struct platform_device *pdev, int enable) { static int count; |
