From c31ff15cdda5efa2babba9a271b2fe2799de20b5 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 7 Jun 2015 07:32:35 +0000 Subject: [PATCH] kernel: move a symbol from the ipq806x config to generic to prevent it from being nuked by make kernel_oldconfig Signed-off-by: Felix Fietkau git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45920 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/generic/config-3.18 | 1 + target/linux/generic/config-4.0 | 1 + target/linux/ipq806x/config-3.18 | 1 - 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/target/linux/generic/config-3.18 b/target/linux/generic/config-3.18 index 31bac92068..609b290312 100644 --- a/target/linux/generic/config-3.18 +++ b/target/linux/generic/config-3.18 @@ -2093,6 +2093,7 @@ CONFIG_MMC_BLOCK_MINORS=8 # CONFIG_MMC_SDHCI is not set # CONFIG_MMC_SDHCI_ACPI is not set # CONFIG_MMC_SDHCI_BCM_KONA is not set +# CONFIG_MMC_SDHCI_MSM is not set # CONFIG_MMC_SDHCI_OF_ARASAN is not set # CONFIG_MMC_SDHCI_OF_ESDHC is not set # CONFIG_MMC_SDHCI_OF_HLWD is not set diff --git a/target/linux/generic/config-4.0 b/target/linux/generic/config-4.0 index 8a9cf33cdd..52701df2a7 100644 --- a/target/linux/generic/config-4.0 +++ b/target/linux/generic/config-4.0 @@ -2127,6 +2127,7 @@ CONFIG_MMC_BLOCK_MINORS=8 # CONFIG_MMC_SDHCI is not set # CONFIG_MMC_SDHCI_ACPI is not set # CONFIG_MMC_SDHCI_BCM_KONA is not set +# CONFIG_MMC_SDHCI_MSM is not set # CONFIG_MMC_SDHCI_OF_ARASAN is not set # CONFIG_MMC_SDHCI_OF_ESDHC is not set # CONFIG_MMC_SDHCI_OF_HLWD is not set diff --git a/target/linux/ipq806x/config-3.18 b/target/linux/ipq806x/config-3.18 index aabbdc2bb5..4d3b884dca 100644 --- a/target/linux/ipq806x/config-3.18 +++ b/target/linux/ipq806x/config-3.18 @@ -243,7 +243,6 @@ CONFIG_MFD_SYSCON=y CONFIG_MIGHT_HAVE_CACHE_L2X0=y CONFIG_MIGHT_HAVE_PCI=y CONFIG_MIGRATION=y -# CONFIG_MMC_SDHCI_MSM is not set CONFIG_MODULES_USE_ELF_REL=y CONFIG_MSM_GCC_8660=y CONFIG_MSM_GCC_8960=y -- 2.11.0