Skip to content

Commit

Permalink
Merge branch 'master' of ssh://git.infradead.org/srv/git/mtd-2.6
Browse files Browse the repository at this point in the history
  • Loading branch information
David Woodhouse committed Oct 6, 2007
2 parents 49dc08e + b7a7018 commit 39fd179
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/mtd/nand/s3c2410.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@

#include <asm/io.h>

#include <asm/arch/regs-nand.h>
#include <asm/arch/nand.h>
#include <asm/plat-s3c/regs-nand.h>
#include <asm/plat-s3c/nand.h>

#ifdef CONFIG_MTD_NAND_S3C2410_HWECC
static int hardware_ecc = 1;
Expand Down

0 comments on commit 39fd179

Please sign in to comment.