Merge tag 'for-linus-3.5-20120601' of git://git.infradead.org/linux-mtd

[linux-2.6-block.git] / arch / mips / rb532 / devices.c

diff --git a/arch/mips/rb532/devices.c b/arch/mips/rb532/devices.c
index ea774285e6c500b43ab0d915b3c292aa091eb307..716e9a12f0e77a0c85f492d3cf760ce41059690a 100644 (file)
--- a/arch/mips/rb532/devices.c
+++ b/arch/mips/rb532/devices.c
@@ -293,7 +293,6 @@ static void __init rb532_nand_setup(void)
        rb532_nand_data.chip.nr_partitions = ARRAY_SIZE(rb532_partition_info);
        rb532_nand_data.chip.partitions = rb532_partition_info;
        rb532_nand_data.chip.chip_delay = NAND_CHIP_DELAY;
-       rb532_nand_data.chip.options = NAND_NO_AUTOINCR;
 }