aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/sunxi/patches-3.13/154-mmc-update-compat-nodes.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2014-02-13 13:27:14 +0000
committerImre Kaloz <kaloz@openwrt.org>2014-02-13 13:27:14 +0000
commitaf63cdf87ad76177fb7180e5fb57ec6f949fbb98 (patch)
tree3f3c2ff5babca3eacef366a9b794b0ea7e5f945e /target/linux/sunxi/patches-3.13/154-mmc-update-compat-nodes.patch
parent83d9cec4911b6639c1c2f22cfb943df3e1252a1e (diff)
downloadupstream-af63cdf87ad76177fb7180e5fb57ec6f949fbb98.tar.gz
upstream-af63cdf87ad76177fb7180e5fb57ec6f949fbb98.tar.bz2
upstream-af63cdf87ad76177fb7180e5fb57ec6f949fbb98.zip
upgrade 3.13 targets to 3.13.2, refresh patches
Signed-off-by: Imre Kaloz <kaloz@openwrt.org SVN-Revision: 39582
Diffstat (limited to 'target/linux/sunxi/patches-3.13/154-mmc-update-compat-nodes.patch')
-rw-r--r--target/linux/sunxi/patches-3.13/154-mmc-update-compat-nodes.patch9
1 files changed, 4 insertions, 5 deletions
diff --git a/target/linux/sunxi/patches-3.13/154-mmc-update-compat-nodes.patch b/target/linux/sunxi/patches-3.13/154-mmc-update-compat-nodes.patch
index 5de609374b..0be3ac4f96 100644
--- a/target/linux/sunxi/patches-3.13/154-mmc-update-compat-nodes.patch
+++ b/target/linux/sunxi/patches-3.13/154-mmc-update-compat-nodes.patch
@@ -1,7 +1,6 @@
-diff -ruN old/drivers/mmc/host/sunxi-mci.c new/drivers/mmc/host/sunxi-mci.c
---- old/drivers/mmc/host/sunxi-mci.c 2014-01-22 23:41:25.000000000 +0100
-+++ new/drivers/mmc/host/sunxi-mci.c 2014-01-28 16:55:24.000000000 +0100
-@@ -715,8 +715,8 @@
+--- a/drivers/mmc/host/sunxi-mci.c
++++ b/drivers/mmc/host/sunxi-mci.c
+@@ -715,8 +715,8 @@ static void sunxi_mmc_request(struct mmc
}
static const struct of_device_id sunxi_mmc_of_match[] = {
@@ -12,7 +11,7 @@ diff -ruN old/drivers/mmc/host/sunxi-mci.c new/drivers/mmc/host/sunxi-mci.c
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, sunxi_mmc_of_match);
-@@ -736,7 +736,7 @@
+@@ -736,7 +736,7 @@ static int sunxi_mmc_resource_request(st
struct device_node *np = pdev->dev.of_node;
int ret;