diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-08-12 06:28:00 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-08-12 06:28:00 -0400 |
| commit | 742c52533b05d8ae83c794bd6811100675b85ce5 (patch) | |
| tree | de89a81d88c19504d1dc4f023a4b480c9022b3b5 /drivers/mtd/nand/atmel_nand.c | |
| parent | 36cd4fb5d277f34fe9e4db0deac2d4efd7dff735 (diff) | |
| parent | 10fec20ef5eec1c91913baec1225400f0d02df40 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-arm/arch-omap/onenand.h
Diffstat (limited to 'drivers/mtd/nand/atmel_nand.c')
| -rw-r--r-- | drivers/mtd/nand/atmel_nand.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c index 99aec46e2145..3387e0d5076b 100644 --- a/drivers/mtd/nand/atmel_nand.c +++ b/drivers/mtd/nand/atmel_nand.c | |||
| @@ -32,8 +32,8 @@ | |||
| 32 | #include <linux/gpio.h> | 32 | #include <linux/gpio.h> |
| 33 | #include <linux/io.h> | 33 | #include <linux/io.h> |
| 34 | 34 | ||
| 35 | #include <asm/arch/board.h> | 35 | #include <mach/board.h> |
| 36 | #include <asm/arch/cpu.h> | 36 | #include <mach/cpu.h> |
| 37 | 37 | ||
| 38 | #ifdef CONFIG_MTD_NAND_ATMEL_ECC_HW | 38 | #ifdef CONFIG_MTD_NAND_ATMEL_ECC_HW |
| 39 | #define hard_ecc 1 | 39 | #define hard_ecc 1 |