diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-17 10:01:30 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-17 10:01:30 -0700 |
| commit | 94c657853bd228ebbc2c590b7f81efcc1dde3329 (patch) | |
| tree | 4fb0a566594ed2bbbf1dd2076806335a29c1e2cc /drivers/mtd | |
| parent | 27615a97b2dc7e98b925973b78d1cdc3ee288ab0 (diff) | |
| parent | 2b6c4e73248758bac8e1ed81b0d0664da0fff6f8 (diff) | |
| download | kernel_goldelico_gta04-94c657853bd228ebbc2c590b7f81efcc1dde3329.zip kernel_goldelico_gta04-94c657853bd228ebbc2c590b7f81efcc1dde3329.tar.gz kernel_goldelico_gta04-94c657853bd228ebbc2c590b7f81efcc1dde3329.tar.bz2 | |
Merge branch 'omap-for-v3.8/cleanup-headers-dma' into omap-for-v3.8/cleanup-headers
Conflicts:
drivers/crypto/omap-aes.c
drivers/crypto/omap-sham.c
drivers/dma/omap-dma.c
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/omap2.c | 4 | ||||
| -rw-r--r-- | drivers/mtd/onenand/omap2.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c index 5b31386..2cbdb8e 100644 --- a/drivers/mtd/nand/omap2.c +++ b/drivers/mtd/nand/omap2.c @@ -27,7 +27,7 @@ #include <linux/bch.h> #endif -#include <plat/dma.h> +#include <plat-omap/dma-omap.h> #include <plat/gpmc.h> #include <linux/platform_data/mtd-nand-omap2.h> @@ -111,6 +111,8 @@ #define ECCCLEAR 0x100 #define ECC1 0x1 +#define OMAP24XX_DMA_GPMC 4 + /* oob info generated runtime depending on ecc algorithm and layout selected */ static struct nand_ecclayout omap_oobinfo; /* Define some generic bad / good block scan pattern which are used diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c index 1961be9..b846eaf 100644 --- a/drivers/mtd/onenand/omap2.c +++ b/drivers/mtd/onenand/omap2.c @@ -42,7 +42,7 @@ #include <linux/platform_data/mtd-onenand-omap2.h> #include <asm/gpio.h> -#include <plat/dma.h> +#include <plat-omap/dma-omap.h> #include <plat/cpu.h> #define DRIVER_NAME "omap2-onenand" |