diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2013-01-01 13:15:30 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2013-01-01 13:15:30 +0000 |
| commit | 92cd48e9eae68bf504b531b5c6bdc544ac595da3 (patch) | |
| tree | d24898892a9cf1dc39d054e0b51f13ef1b34ada9 /target/linux | |
| parent | 03e09078dc15cf8a439ca950ad13d856fba372ae (diff) | |
| download | upstream-92cd48e9eae68bf504b531b5c6bdc544ac595da3.tar.gz upstream-92cd48e9eae68bf504b531b5c6bdc544ac595da3.tar.bz2 upstream-92cd48e9eae68bf504b531b5c6bdc544ac595da3.zip | |
adm5120: remove NAND_NO_AUTOINCR flag from rb1xx.c
Also add a compatibility patch for 3.3.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 34950
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-1xx.c | 1 | ||||
| -rw-r--r-- | target/linux/adm5120/patches-3.3/a01-rb1xx-nand-add-NAND_NO_AUTOINCR-flag.patch | 11 |
2 files changed, 11 insertions, 1 deletions
diff --git a/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-1xx.c b/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-1xx.c index 2ad8c42200..8961115c7e 100644 --- a/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-1xx.c +++ b/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-1xx.c @@ -83,7 +83,6 @@ struct platform_nand_data rb1xx_nand_data __initdata = { .nr_partitions = ARRAY_SIZE(rb1xx_nand_parts), .partitions = rb1xx_nand_parts, .chip_delay = RB1XX_NAND_CHIP_DELAY, - .options = NAND_NO_AUTOINCR, .chip_fixup = rb1xx_nand_fixup, }, }; diff --git a/target/linux/adm5120/patches-3.3/a01-rb1xx-nand-add-NAND_NO_AUTOINCR-flag.patch b/target/linux/adm5120/patches-3.3/a01-rb1xx-nand-add-NAND_NO_AUTOINCR-flag.patch new file mode 100644 index 0000000000..3aa4fa9d40 --- /dev/null +++ b/target/linux/adm5120/patches-3.3/a01-rb1xx-nand-add-NAND_NO_AUTOINCR-flag.patch @@ -0,0 +1,11 @@ +reverted: +--- b/arch/mips/adm5120/mikrotik/rb-1xx.c ++++ a/arch/mips/adm5120/mikrotik/rb-1xx.c +@@ -83,6 +83,7 @@ + .nr_partitions = ARRAY_SIZE(rb1xx_nand_parts), + .partitions = rb1xx_nand_parts, + .chip_delay = RB1XX_NAND_CHIP_DELAY, ++ .options = NAND_NO_AUTOINCR, + .chip_fixup = rb1xx_nand_fixup, + }, + }; |