aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-12-12 16:49:46 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-12-12 16:49:46 +0000
commit9a82e50b885a8ae81724a1aff686d59944e5374f (patch)
treeab72f10a1145aa42630e2464ae09eefb22cc30a2 /target
parent6fe90cf4cb9ffd04741687a5314ed224c6b0ad51 (diff)
downloadmaster-187ad058-9a82e50b885a8ae81724a1aff686d59944e5374f.tar.gz
master-187ad058-9a82e50b885a8ae81724a1aff686d59944e5374f.tar.bz2
master-187ad058-9a82e50b885a8ae81724a1aff686d59944e5374f.zip
ar71xx: refresh 3.3 patches
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34644 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/ar71xx/patches-3.3/a02-ar934x_nfc-add-NO_AUTOINCR-flag.patch2
-rw-r--r--target/linux/ar71xx/patches-3.3/a05-ar934x_nfc-add-buffer-verification.patch4
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ar71xx/patches-3.3/a02-ar934x_nfc-add-NO_AUTOINCR-flag.patch b/target/linux/ar71xx/patches-3.3/a02-ar934x_nfc-add-NO_AUTOINCR-flag.patch
index 8f7c972fd3..0a7a221efd 100644
--- a/target/linux/ar71xx/patches-3.3/a02-ar934x_nfc-add-NO_AUTOINCR-flag.patch
+++ b/target/linux/ar71xx/patches-3.3/a02-ar934x_nfc-add-NO_AUTOINCR-flag.patch
@@ -1,7 +1,7 @@
reverted:
--- a/drivers/mtd/nand/ar934x_nfc.c
+++ b/drivers/mtd/nand/ar934x_nfc.c
-@@ -1039,6 +1039,7 @@ ar934x_nfc_probe(struct platform_device
+@@ -1064,6 +1064,7 @@ ar934x_nfc_probe(struct platform_device
else
mtd->name = dev_name(&pdev->dev);
diff --git a/target/linux/ar71xx/patches-3.3/a05-ar934x_nfc-add-buffer-verification.patch b/target/linux/ar71xx/patches-3.3/a05-ar934x_nfc-add-buffer-verification.patch
index c4c462804e..69027ade9a 100644
--- a/target/linux/ar71xx/patches-3.3/a05-ar934x_nfc-add-buffer-verification.patch
+++ b/target/linux/ar71xx/patches-3.3/a05-ar934x_nfc-add-buffer-verification.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/nand/ar934x_nfc.c
+++ b/drivers/mtd/nand/ar934x_nfc.c
-@@ -762,6 +762,18 @@ ar934x_nfc_read_buf(struct mtd_info *mtd
+@@ -786,6 +786,18 @@ ar934x_nfc_read_buf(struct mtd_info *mtd
nfc->buf_index = buf_index;
}
@@ -19,7 +19,7 @@
static void
ar934x_nfc_hw_init(struct ar934x_nfc *nfc)
{
-@@ -1048,6 +1060,7 @@ ar934x_nfc_probe(struct platform_device
+@@ -1073,6 +1085,7 @@ ar934x_nfc_probe(struct platform_device
nand->read_byte = ar934x_nfc_read_byte;
nand->write_buf = ar934x_nfc_write_buf;
nand->read_buf = ar934x_nfc_read_buf;