diff options
author | John Crispin <john@openwrt.org> | 2014-12-05 00:20:41 +0000 |
---|---|---|
committer | John Crispin <john@openwrt.org> | 2014-12-05 00:20:41 +0000 |
commit | e553dfc356b7087e362f0daa283239ee01ae81f5 (patch) | |
tree | f91fac0c53ff97a1c3ceabce64fb9dd62933a3d2 /target/linux/oxnas/patches-3.14/350-oxnas-reset.patch | |
parent | dcc8a8ca9eac90b3e70104c893464c27e62daed5 (diff) | |
download | upstream-e553dfc356b7087e362f0daa283239ee01ae81f5.tar.gz upstream-e553dfc356b7087e362f0daa283239ee01ae81f5.tar.bz2 upstream-e553dfc356b7087e362f0daa283239ee01ae81f5.zip |
oxnas: re-add support for kernel 3.14
This reverts commit c81ddddde5fd193802d511b42eb7b108aac17136 on
https://gitorious.org/openwrt-oxnas/openwrt-oxnas.git
which removed patches and config for 3.14.
[arm_introduce-dma-fiq-irq-broadcast patch was renamed to match 3.18]
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
SVN-Revision: 43520
Diffstat (limited to 'target/linux/oxnas/patches-3.14/350-oxnas-reset.patch')
-rw-r--r-- | target/linux/oxnas/patches-3.14/350-oxnas-reset.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/target/linux/oxnas/patches-3.14/350-oxnas-reset.patch b/target/linux/oxnas/patches-3.14/350-oxnas-reset.patch new file mode 100644 index 0000000000..820d70b2df --- /dev/null +++ b/target/linux/oxnas/patches-3.14/350-oxnas-reset.patch @@ -0,0 +1,20 @@ +Index: linux-3.14.18/drivers/reset/Kconfig +=================================================================== +--- linux-3.14.18.orig/drivers/reset/Kconfig ++++ linux-3.14.18/drivers/reset/Kconfig +@@ -11,3 +11,7 @@ menuconfig RESET_CONTROLLER + via GPIOs or SoC-internal reset controller modules. + + If unsure, say no. ++ ++config RESET_CONTROLLER_OXNAS ++ bool ++ select RESET_CONTROLLER +Index: linux-3.14.18/drivers/reset/Makefile +=================================================================== +--- linux-3.14.18.orig/drivers/reset/Makefile ++++ linux-3.14.18/drivers/reset/Makefile +@@ -1,2 +1,3 @@ + obj-$(CONFIG_RESET_CONTROLLER) += core.o ++obj-$(CONFIG_RESET_CONTROLLER_OXNAS) += reset-ox820.o + obj-$(CONFIG_ARCH_SUNXI) += reset-sunxi.o |