kernel: update 3.18 to 3.18.14

[openwrt.git] / target / linux / oxnas / patches-3.18 / 330-oxnas-pinctrl.patch

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 3ecc6eb..1bca799 100644 (file)
--- 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