kernel: update 3.14 to 3.14.18

[openwrt/openwrt.git] / target / linux / sunxi / patches-3.14 / 147-sun6i-enable-spi-in-defconfig.patch

diff --git a/target/linux/sunxi/patches-3.14/147-sun6i-enable-spi-in-defconfig.patch b/target/linux/sunxi/patches-3.14/147-sun6i-enable-spi-in-defconfig.patch
index 2eac6a45cdd2e055c89c89be82d369673aee2daf..6f2dbe5375567dc3f2325451a5460e04d0da5948 100644 (file)
--- a/target/linux/sunxi/patches-3.14/147-sun6i-enable-spi-in-defconfig.patch
+++ b/target/linux/sunxi/patches-3.14/147-sun6i-enable-spi-in-defconfig.patch
@@ -8,8 +8,6 @@ Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
  arch/arm/configs/sunxi_defconfig | 3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig
-index 3e2259b..b5df4a5 100644
 --- a/arch/arm/configs/sunxi_defconfig
 +++ b/arch/arm/configs/sunxi_defconfig
 @@ -24,6 +24,7 @@ CONFIG_IP_PNP_BOOTP=y
@@ -29,6 +27,3 @@ index 3e2259b..b5df4a5 100644
  CONFIG_GPIO_SYSFS=y
  # CONFIG_HWMON is not set
  CONFIG_WATCHDOG=y
--- 
-2.0.3
-