diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-11-22 13:08:43 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-11-22 13:08:43 -0500 |
| commit | a76df42a675c9936e8bf3607226e74c8a5e2d847 (patch) | |
| tree | 96d93706d884dea956393653452fa4d78d8d7f76 /arch/arm/mach-omap2/gpmc-onenand.c | |
| parent | 648f4e3e50c4793d9dbf9a09afa193631f76fa26 (diff) | |
| parent | 8171d88089ad63fc442b2bf32af7c18653adc5cb (diff) | |
Merge 7xx-iosplit-plat-merge with omap-fixes
Merge branch '7xx-iosplit-plat-merge' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/gpmc-onenand.c')
| -rw-r--r-- | arch/arm/mach-omap2/gpmc-onenand.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/gpmc-onenand.c b/arch/arm/mach-omap2/gpmc-onenand.c index 54fec53a48e7..7bb69220adfa 100644 --- a/arch/arm/mach-omap2/gpmc-onenand.c +++ b/arch/arm/mach-omap2/gpmc-onenand.c | |||
| @@ -17,9 +17,9 @@ | |||
| 17 | 17 | ||
| 18 | #include <asm/mach/flash.h> | 18 | #include <asm/mach/flash.h> |
| 19 | 19 | ||
| 20 | #include <mach/onenand.h> | 20 | #include <plat/onenand.h> |
| 21 | #include <mach/board.h> | 21 | #include <plat/board.h> |
| 22 | #include <mach/gpmc.h> | 22 | #include <plat/gpmc.h> |
| 23 | 23 | ||
| 24 | static struct omap_onenand_platform_data *gpmc_onenand_data; | 24 | static struct omap_onenand_platform_data *gpmc_onenand_data; |
| 25 | 25 | ||