kernel: update 3.14 to 3.14.18

[openwrt/openwrt.git] / target / linux / ipq806x / patches / 0182-qcom-Kconfig-Make-drivers-mutually-exclusive.patch

diff --git a/target/linux/ipq806x/patches/0182-qcom-Kconfig-Make-drivers-mutually-exclusive.patch b/target/linux/ipq806x/patches/0182-qcom-Kconfig-Make-drivers-mutually-exclusive.patch
index 87e2fad612c78ae76f3ab77c048612d7f25fa801..f4b551bac668ba95c4107c1c553f88596381a240 100644 (file)
--- a/target/linux/ipq806x/patches/0182-qcom-Kconfig-Make-drivers-mutually-exclusive.patch
+++ b/target/linux/ipq806x/patches/0182-qcom-Kconfig-Make-drivers-mutually-exclusive.patch
@@ -13,8 +13,6 @@ Signed-off-by: Andy Gross <agross@codeaurora.org>
  drivers/mtd/nand/Kconfig |    6 +++---
  2 files changed, 4 insertions(+), 4 deletions(-)
 
-diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
-index 79155fa..ed7a5f6 100644
 --- a/drivers/dma/Kconfig
 +++ b/drivers/dma/Kconfig
 @@ -412,7 +412,7 @@ config QCOM_BAM_DMA
@@ -26,8 +24,6 @@ index 79155fa..ed7a5f6 100644
        select DMA_ENGINE
        select DMA_VIRTUAL_CHANNELS
        ---help---
-diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
-index 6e3842f..4a84264 100644
 --- a/drivers/mtd/nand/Kconfig
 +++ b/drivers/mtd/nand/Kconfig
 @@ -511,15 +511,15 @@ config MTD_NAND_XWAY
@@ -49,6 +45,3 @@ index 6e3842f..4a84264 100644
        select CRC16
        select BITREVERSE
        select MTD_NAND_IDS
--- 
-1.7.10.4
-