summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2440/mach-mini2440.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-06-25 13:49:07 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-06-25 13:49:07 +0100
commit8fd3ec6309dc3c8b6addc9015458bfae87592a1f (patch)
treedd7169c446f983b6fda884ff9b6bc3e1bbe5904e /arch/arm/mach-s3c2440/mach-mini2440.c
parentf9bfccf11df33dae874aac58b0926004ae833167 (diff)
parent76609a6928bff29ca05a94420ae3e088fbb9c2f9 (diff)
downloadop-kernel-dev-8fd3ec6309dc3c8b6addc9015458bfae87592a1f.zip
op-kernel-dev-8fd3ec6309dc3c8b6addc9015458bfae87592a1f.tar.gz
Merge branch 's3c-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux
Diffstat (limited to 'arch/arm/mach-s3c2440/mach-mini2440.c')
-rw-r--r--arch/arm/mach-s3c2440/mach-mini2440.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2440/mach-mini2440.c b/arch/arm/mach-s3c2440/mach-mini2440.c
index 6a5bc30..ec71a69 100644
--- a/arch/arm/mach-s3c2440/mach-mini2440.c
+++ b/arch/arm/mach-s3c2440/mach-mini2440.c
@@ -48,8 +48,6 @@
#include <plat/mci.h>
#include <plat/udc.h>
-#include <plat/regs-serial.h>
-
#include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h>
#include <linux/mtd/nand_ecc.h>
@@ -275,6 +273,7 @@ static struct s3c2410_nand_set mini2440_nand_sets[] __initdata = {
.nr_chips = 1,
.nr_partitions = ARRAY_SIZE(mini2440_default_nand_part),
.partitions = mini2440_default_nand_part,
+ .flash_bbt = 1, /* we use u-boot to create a BBT */
},
};
OpenPOWER on IntegriCloud