aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/oxnas/patches-3.18/330-oxnas-pinctrl.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-05-21 19:32:46 +0000
committerJonas Gorski <jogo@openwrt.org>2015-05-21 19:32:46 +0000
commit76d079204df113afa9e382a43abb5e1a2135150d (patch)
tree8e472ab203e8d6a47dc2e285b3becbfca35d04c6 /target/linux/oxnas/patches-3.18/330-oxnas-pinctrl.patch
parent072937888e133f5e97fd05a7496eaf7eeae04079 (diff)
downloadupstream-76d079204df113afa9e382a43abb5e1a2135150d.tar.gz
upstream-76d079204df113afa9e382a43abb5e1a2135150d.tar.bz2
upstream-76d079204df113afa9e382a43abb5e1a2135150d.zip
kernel: update 3.18 to 3.18.14
Changelogs: * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.12 * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.13 * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.14 Build tested on brcm63xx and ipq806x, runtested on brcm63xx. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 45711
Diffstat (limited to 'target/linux/oxnas/patches-3.18/330-oxnas-pinctrl.patch')
-rw-r--r--target/linux/oxnas/patches-3.18/330-oxnas-pinctrl.patch12
1 files changed, 4 insertions, 8 deletions
diff --git a/target/linux/oxnas/patches-3.18/330-oxnas-pinctrl.patch b/target/linux/oxnas/patches-3.18/330-oxnas-pinctrl.patch
index 3ecc6ebe77..1bca799b8a 100644
--- a/target/linux/oxnas/patches-3.18/330-oxnas-pinctrl.patch
+++ b/target/linux/oxnas/patches-3.18/330-oxnas-pinctrl.patch
@@ -1,7 +1,5 @@
-Index: linux-3.18-rc4/drivers/pinctrl/Kconfig
-===================================================================
---- linux-3.18-rc4.orig/drivers/pinctrl/Kconfig
-+++ linux-3.18-rc4/drivers/pinctrl/Kconfig
+--- a/drivers/pinctrl/Kconfig
++++ b/drivers/pinctrl/Kconfig
@@ -67,6 +67,15 @@ config PINCTRL_AT91
help
Say Y here to enable the at91 pinctrl driver
@@ -18,10 +16,8 @@ Index: linux-3.18-rc4/drivers/pinctrl/Kconfig
config PINCTRL_BAYTRAIL
bool "Intel Baytrail GPIO pin control"
depends on GPIOLIB && ACPI && X86
-Index: linux-3.18-rc4/drivers/pinctrl/Makefile
-===================================================================
---- linux-3.18-rc4.orig/drivers/pinctrl/Makefile
-+++ linux-3.18-rc4/drivers/pinctrl/Makefile
+--- a/drivers/pinctrl/Makefile
++++ b/drivers/pinctrl/Makefile
@@ -18,6 +18,7 @@ obj-$(CONFIG_PINCTRL_BCM2835) += pinctrl
obj-$(CONFIG_PINCTRL_BAYTRAIL) += pinctrl-baytrail.o
obj-$(CONFIG_PINCTRL_BCM281XX) += pinctrl-bcm281xx.o