diff options
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-ep93xx/snappercl15.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/ixdp425-setup.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-nomadik/board-nhk8815.c | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-ep93xx/snappercl15.c b/arch/arm/mach-ep93xx/snappercl15.c index 5df9092f1fcc..376b8f5ecfa3 100644 --- a/arch/arm/mach-ep93xx/snappercl15.c +++ b/arch/arm/mach-ep93xx/snappercl15.c | |||
@@ -100,7 +100,6 @@ static struct platform_nand_data snappercl15_nand_data = { | |||
100 | .nr_chips = 1, | 100 | .nr_chips = 1, |
101 | .partitions = snappercl15_nand_parts, | 101 | .partitions = snappercl15_nand_parts, |
102 | .nr_partitions = ARRAY_SIZE(snappercl15_nand_parts), | 102 | .nr_partitions = ARRAY_SIZE(snappercl15_nand_parts), |
103 | .options = NAND_NO_AUTOINCR, | ||
104 | .chip_delay = 25, | 103 | .chip_delay = 25, |
105 | }, | 104 | }, |
106 | .ctrl = { | 105 | .ctrl = { |
diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c index fccfc73e69f1..108a9d3f382d 100644 --- a/arch/arm/mach-ixp4xx/ixdp425-setup.c +++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c | |||
@@ -98,7 +98,6 @@ static struct platform_nand_data ixdp425_flash_nand_data = { | |||
98 | .chip = { | 98 | .chip = { |
99 | .nr_chips = 1, | 99 | .nr_chips = 1, |
100 | .chip_delay = 30, | 100 | .chip_delay = 30, |
101 | .options = NAND_NO_AUTOINCR, | ||
102 | .partitions = ixdp425_partitions, | 101 | .partitions = ixdp425_partitions, |
103 | .nr_partitions = ARRAY_SIZE(ixdp425_partitions), | 102 | .nr_partitions = ARRAY_SIZE(ixdp425_partitions), |
104 | }, | 103 | }, |
diff --git a/arch/arm/mach-nomadik/board-nhk8815.c b/arch/arm/mach-nomadik/board-nhk8815.c index 58cacafcf662..2e8d3e176bc7 100644 --- a/arch/arm/mach-nomadik/board-nhk8815.c +++ b/arch/arm/mach-nomadik/board-nhk8815.c | |||
@@ -111,7 +111,7 @@ static struct nomadik_nand_platform_data nhk8815_nand_data = { | |||
111 | .parts = nhk8815_partitions, | 111 | .parts = nhk8815_partitions, |
112 | .nparts = ARRAY_SIZE(nhk8815_partitions), | 112 | .nparts = ARRAY_SIZE(nhk8815_partitions), |
113 | .options = NAND_COPYBACK | NAND_CACHEPRG | NAND_NO_PADDING \ | 113 | .options = NAND_COPYBACK | NAND_CACHEPRG | NAND_NO_PADDING \ |
114 | | NAND_NO_READRDY | NAND_NO_AUTOINCR, | 114 | | NAND_NO_READRDY, |
115 | .init = nhk8815_nand_init, | 115 | .init = nhk8815_nand_init, |
116 | }; | 116 | }; |
117 | 117 | ||