diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-11-11 03:10:34 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-11-11 03:10:34 +0100 |
| commit | 774facda20d2f8f0f61fa312d8028dad18ac5ee4 (patch) | |
| tree | a9068b769fa5956beaabc2445ebe1d575585d7d3 /drivers/mtd | |
| parent | Linux 2.6.32-rc6 (diff) | |
| parent | omap: headers: Move remaining headers from include/mach to include/plat (diff) | |
| download | linux-774facda20d2f8f0f61fa312d8028dad18ac5ee4.tar.xz linux-774facda20d2f8f0f61fa312d8028dad18ac5ee4.zip | |
Merge branch '7xx-iosplit-plat' with omap-fixes
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/maps/omap_nor.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/nand/ams-delta.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/nand/omap2.c | 6 | ||||
| -rw-r--r-- | drivers/mtd/onenand/omap2.c | 8 |
4 files changed, 9 insertions, 9 deletions
diff --git a/drivers/mtd/maps/omap_nor.c b/drivers/mtd/maps/omap_nor.c index a24478102b11..ead0b2fab670 100644 --- a/drivers/mtd/maps/omap_nor.c +++ b/drivers/mtd/maps/omap_nor.c @@ -45,7 +45,7 @@ #include <asm/io.h> #include <mach/hardware.h> #include <asm/mach/flash.h> -#include <mach/tc.h> +#include <plat/tc.h> #ifdef CONFIG_MTD_PARTITIONS static const char *part_probes[] = { /* "RedBoot", */ "cmdlinepart", NULL }; diff --git a/drivers/mtd/nand/ams-delta.c b/drivers/mtd/nand/ams-delta.c index 005b91f096f2..2548e1065bf8 100644 --- a/drivers/mtd/nand/ams-delta.c +++ b/drivers/mtd/nand/ams-delta.c @@ -25,7 +25,7 @@ #include <mach/hardware.h> #include <asm/sizes.h> #include <mach/gpio.h> -#include <mach/board-ams-delta.h> +#include <plat/board-ams-delta.h> /* * MTD structure for E3 (Delta) diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c index 090ab87086b5..1bb799f0125c 100644 --- a/drivers/mtd/nand/omap2.c +++ b/drivers/mtd/nand/omap2.c @@ -18,9 +18,9 @@ #include <linux/mtd/partitions.h> #include <linux/io.h> -#include <mach/dma.h> -#include <mach/gpmc.h> -#include <mach/nand.h> +#include <plat/dma.h> +#include <plat/gpmc.h> +#include <plat/nand.h> #define GPMC_IRQ_STATUS 0x18 #define GPMC_ECC_CONFIG 0x1F4 diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c index 0108ed42e877..86c4f6dcdc65 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" |