diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-12-08 12:04:25 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-12-08 12:04:25 +0000 |
commit | 6e4472e69e89aa56ad8c0e6f90415a2b8da36eba (patch) | |
tree | b35c1688c3303eb7f7dff2304798f8eb320812fb /target/linux/oxnas/patches-3.14/330-oxnas-pinctrl.patch | |
parent | a899dbd4e32835b0a1d917479d10e5a2744c273c (diff) | |
download | master-187ad058-6e4472e69e89aa56ad8c0e6f90415a2b8da36eba.tar.gz master-187ad058-6e4472e69e89aa56ad8c0e6f90415a2b8da36eba.tar.bz2 master-187ad058-6e4472e69e89aa56ad8c0e6f90415a2b8da36eba.zip |
kernel: refresh patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43564 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/oxnas/patches-3.14/330-oxnas-pinctrl.patch')
-rw-r--r-- | target/linux/oxnas/patches-3.14/330-oxnas-pinctrl.patch | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/target/linux/oxnas/patches-3.14/330-oxnas-pinctrl.patch b/target/linux/oxnas/patches-3.14/330-oxnas-pinctrl.patch index 60caca361d..5451962b4b 100644 --- a/target/linux/oxnas/patches-3.14/330-oxnas-pinctrl.patch +++ b/target/linux/oxnas/patches-3.14/330-oxnas-pinctrl.patch @@ -1,7 +1,5 @@ -Index: linux-3.14.18/drivers/pinctrl/Kconfig -=================================================================== ---- linux-3.14.18.orig/drivers/pinctrl/Kconfig -+++ linux-3.14.18/drivers/pinctrl/Kconfig +--- a/drivers/pinctrl/Kconfig ++++ b/drivers/pinctrl/Kconfig @@ -87,6 +87,15 @@ config PINCTRL_AT91 help Say Y here to enable the at91 pinctrl driver @@ -18,10 +16,8 @@ Index: linux-3.14.18/drivers/pinctrl/Kconfig config PINCTRL_BAYTRAIL bool "Intel Baytrail GPIO pin control" depends on GPIOLIB && ACPI && X86 -Index: linux-3.14.18/drivers/pinctrl/Makefile -=================================================================== ---- linux-3.14.18.orig/drivers/pinctrl/Makefile -+++ linux-3.14.18/drivers/pinctrl/Makefile +--- a/drivers/pinctrl/Makefile ++++ b/drivers/pinctrl/Makefile @@ -67,6 +67,7 @@ obj-$(CONFIG_PINCTRL_LANTIQ) += pinctrl- obj-$(CONFIG_PINCTRL_TB10X) += pinctrl-tb10x.o obj-$(CONFIG_PINCTRL_ST) += pinctrl-st.o |