diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-10-06 13:22:26 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-10-06 13:22:26 -0400 |
| commit | 39fd179a7bfca026a269724a1f4ee5eb3f10419a (patch) | |
| tree | 17c346d32a831fe641bb88c92707c2471650e135 | |
| parent | 49dc08eeda707f59019814fe07a2b17979348002 (diff) | |
| parent | b7a701851842e6a3d33ac1b0f80379664c633d49 (diff) | |
Merge branch 'master' of ssh://git.infradead.org/srv/git/mtd-2.6
| -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 5fac4c421a20..b79a9cf2d162 100644 --- a/drivers/mtd/nand/s3c2410.c +++ b/drivers/mtd/nand/s3c2410.c | |||
| @@ -60,8 +60,8 @@ | |||
| 60 | 60 | ||
| 61 | #include <asm/io.h> | 61 | #include <asm/io.h> |
| 62 | 62 | ||
| 63 | #include <asm/arch/regs-nand.h> | 63 | #include <asm/plat-s3c/regs-nand.h> |
| 64 | #include <asm/arch/nand.h> | 64 | #include <asm/plat-s3c/nand.h> |
| 65 | 65 | ||
| 66 | #ifdef CONFIG_MTD_NAND_S3C2410_HWECC | 66 | #ifdef CONFIG_MTD_NAND_S3C2410_HWECC |
| 67 | static int hardware_ecc = 1; | 67 | static int hardware_ecc = 1; |