aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/sunxi/patches-3.13/105-reset-add-reset-ctrler.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/105-reset-add-reset-ctrler.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/105-reset-add-reset-ctrler.patch')
-rw-r--r--target/linux/sunxi/patches-3.13/105-reset-add-reset-ctrler.patch8
1 files changed, 0 insertions, 8 deletions
diff --git a/target/linux/sunxi/patches-3.13/105-reset-add-reset-ctrler.patch b/target/linux/sunxi/patches-3.13/105-reset-add-reset-ctrler.patch
index 38c8f75878..b99720396f 100644
--- a/target/linux/sunxi/patches-3.13/105-reset-add-reset-ctrler.patch
+++ b/target/linux/sunxi/patches-3.13/105-reset-add-reset-ctrler.patch
@@ -21,16 +21,11 @@ Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
2 files changed, 176 insertions(+)
create mode 100644 drivers/reset/reset-sunxi.c
-diff --git a/drivers/reset/Makefile b/drivers/reset/Makefile
-index 1e2d83f..cc29832 100644
--- a/drivers/reset/Makefile
+++ b/drivers/reset/Makefile
@@ -1 +1,2 @@
obj-$(CONFIG_RESET_CONTROLLER) += core.o
+obj-$(CONFIG_ARCH_SUNXI) += reset-sunxi.o
-diff --git a/drivers/reset/reset-sunxi.c b/drivers/reset/reset-sunxi.c
-new file mode 100644
-index 0000000..695bd34
--- /dev/null
+++ b/drivers/reset/reset-sunxi.c
@@ -0,0 +1,175 @@
@@ -209,6 +204,3 @@ index 0000000..695bd34
+MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com");
+MODULE_DESCRIPTION("Allwinner SoCs Reset Controller Driver");
+MODULE_LICENSE("GPL");
---
-1.8.5.1
-