diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-08 11:15:29 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-08 11:15:29 -0500 |
| commit | 1c496784a0d317535f846ddb2c93a08ba936266b (patch) | |
| tree | 6d0225860032f263b6d95a3e55c364a1a5f55ec1 /drivers/mtd/nand | |
| parent | adf9904dc774f23f04a5425f0198483ea61f878b (diff) | |
| parent | 9a01609e1885b827b979d6d9dd86f43208a9e5fc (diff) | |
Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (149 commits)
arm: omap: Add omap3_defconfig
AM35xx: Defconfig for AM3517 EVM board
AM35xx: Add support for AM3517 EVM board
omap: 3630sdp: defconfig creation
omap: 3630sdp: introduce 3630 sdp board support
omap3: Add defconfig for IGEP v2 board
omap3: Add minimal IGEP v2 support
omap3: Add CompuLab CM-T35 defconfig
omap3: Add CompuLab CM-T35 board support
omap3: rx51: Add wl1251 wlan driver support
omap3: rx51: Add SDRAM init
omap1: Add default kernel configuration for Herald
omap1: Add board support and LCD for HTC Herald
omap: zoom2: update defconfig for LL_DEBUG_NONE
omap: zoom3: defconfig creation
omap3: zoom: Introduce zoom3 board support
omap3: zoom: Drop i2c-1 speed to 2400
omap3: zoom: rename zoom2 name to generic zoom
omap3: zoom: split board file for software reuse
omap3evm: MIgrate to smsc911x ethernet driver
...
Fix trivial conflict (two unrelated config options added next to each
other) in arch/arm/mach-omap2/Makefile
Diffstat (limited to 'drivers/mtd/nand')
| -rw-r--r-- | drivers/mtd/nand/ams-delta.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/nand/omap2.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mtd/nand/ams-delta.c b/drivers/mtd/nand/ams-delta.c index 005b91f096f..2548e1065bf 100644 --- a/drivers/mtd/nand/ams-delta.c +++ b/drivers/mtd/nand/ams-delta.c | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | #include <mach/hardware.h> | 25 | #include <mach/hardware.h> |
| 26 | #include <asm/sizes.h> | 26 | #include <asm/sizes.h> |
| 27 | #include <mach/gpio.h> | 27 | #include <mach/gpio.h> |
| 28 | #include <mach/board-ams-delta.h> | 28 | #include <plat/board-ams-delta.h> |
| 29 | 29 | ||
| 30 | /* | 30 | /* |
| 31 | * MTD structure for E3 (Delta) | 31 | * MTD structure for E3 (Delta) |
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c index 090ab87086b..1bb799f0125 100644 --- a/drivers/mtd/nand/omap2.c +++ b/drivers/mtd/nand/omap2.c | |||
| @@ -18,9 +18,9 @@ | |||
| 18 | #include <linux/mtd/partitions.h> | 18 | #include <linux/mtd/partitions.h> |
| 19 | #include <linux/io.h> | 19 | #include <linux/io.h> |
| 20 | 20 | ||
| 21 | #include <mach/dma.h> | 21 | #include <plat/dma.h> |
| 22 | #include <mach/gpmc.h> | 22 | #include <plat/gpmc.h> |
| 23 | #include <mach/nand.h> | 23 | #include <plat/nand.h> |
| 24 | 24 | ||
| 25 | #define GPMC_IRQ_STATUS 0x18 | 25 | #define GPMC_IRQ_STATUS 0x18 |
| 26 | #define GPMC_ECC_CONFIG 0x1F4 | 26 | #define GPMC_ECC_CONFIG 0x1F4 |