diff options
author | Tony Lindgren <tony@atomide.com> | 2009-11-22 18:08:43 (GMT) |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2009-11-22 18:08:43 (GMT) |
commit | a76df42a675c9936e8bf3607226e74c8a5e2d847 (patch) | |
tree | 96d93706d884dea956393653452fa4d78d8d7f76 /drivers/mtd/onenand/omap2.c | |
parent | 648f4e3e50c4793d9dbf9a09afa193631f76fa26 (diff) | |
parent | 8171d88089ad63fc442b2bf32af7c18653adc5cb (diff) | |
download | linux-fsl-qoriq-a76df42a675c9936e8bf3607226e74c8a5e2d847.tar.xz |
Merge 7xx-iosplit-plat-merge with omap-fixes
Merge branch '7xx-iosplit-plat-merge' into omap-for-linus
Diffstat (limited to 'drivers/mtd/onenand/omap2.c')
-rw-r--r-- | drivers/mtd/onenand/omap2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c index 0108ed4..86c4f6dc 100644 --- a/drivers/mtd/onenand/omap2.c +++ b/drivers/mtd/onenand/omap2.c @@ -36,13 +36,13 @@ #include <linux/io.h> #include <asm/mach/flash.h> -#include <mach/gpmc.h> -#include <mach/onenand.h> +#include <plat/gpmc.h> +#include <plat/onenand.h> #include <mach/gpio.h> -#include <mach/dma.h> +#include <plat/dma.h> -#include <mach/board.h> +#include <plat/board.h> #define DRIVER_NAME "omap2-onenand" |