kernel: update 3.14 to 3.14.18

[openwrt/staging/stintel.git] / target / linux / ipq806x / patches / 0152-ARM-qcom-config-Add-NAND-config-options.patch

diff --git a/target/linux/ipq806x/patches/0152-ARM-qcom-config-Add-NAND-config-options.patch b/target/linux/ipq806x/patches/0152-ARM-qcom-config-Add-NAND-config-options.patch
index 97f012dfb633b85e4a98bd678590186263d91173..a2489e49e5059eb073bb9c17c0ff532a3629e413 100644 (file)
--- a/target/linux/ipq806x/patches/0152-ARM-qcom-config-Add-NAND-config-options.patch
+++ b/target/linux/ipq806x/patches/0152-ARM-qcom-config-Add-NAND-config-options.patch
@@ -10,8 +10,6 @@ Signed-off-by: Andy Gross <agross@codeaurora.org>
  arch/arm/configs/qcom_defconfig |    1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig
-index 85a35af..e3f9013 100644
 --- a/arch/arm/configs/qcom_defconfig
 +++ b/arch/arm/configs/qcom_defconfig
 @@ -56,6 +56,7 @@ CONFIG_DEVTMPFS_MOUNT=y
@@ -22,6 +20,3 @@ index 85a35af..e3f9013 100644
  CONFIG_BLK_DEV_LOOP=y
  CONFIG_BLK_DEV_RAM=y
  CONFIG_SCSI_TGT=y
--- 
-1.7.10.4
-