diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-29 14:35:07 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-29 14:35:07 -0500 |
| commit | fba670013d538719d13f103b2a5b4b06bdca202b (patch) | |
| tree | f7b97d71161a17619e0ba92ffbef5ec2e7823776 /drivers/mtd/nand | |
| parent | 7577fdfa52438a19e7e8abedb6efc645986af2ae (diff) | |
| parent | e856359685143a2f65876e7db4e4aa0ef5dce7f0 (diff) | |
Merge branch 's3c-moves2' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
Diffstat (limited to 'drivers/mtd/nand')
| -rw-r--r-- | drivers/mtd/nand/s3c2410.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c index bc9aa64bf187..8e375d5fe231 100644 --- a/drivers/mtd/nand/s3c2410.c +++ b/drivers/mtd/nand/s3c2410.c | |||
| @@ -45,8 +45,8 @@ | |||
| 45 | 45 | ||
| 46 | #include <asm/io.h> | 46 | #include <asm/io.h> |
| 47 | 47 | ||
| 48 | #include <asm/plat-s3c/regs-nand.h> | 48 | #include <plat/regs-nand.h> |
| 49 | #include <asm/plat-s3c/nand.h> | 49 | #include <plat/nand.h> |
| 50 | 50 | ||
| 51 | #ifdef CONFIG_MTD_NAND_S3C2410_HWECC | 51 | #ifdef CONFIG_MTD_NAND_S3C2410_HWECC |
| 52 | static int hardware_ecc = 1; | 52 | static int hardware_ecc = 1; |