aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-06-07 07:32:35 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-06-07 07:32:35 +0000
commitb9ebf29fbd7cec672ab36b4dcddaf1331312faae (patch)
tree4d5a65f5d011dd2030b11f10c48ef1f51e797f6a /target/linux
parent7138c77f5aa347ed310c28df05caec19a6425649 (diff)
downloadupstream-b9ebf29fbd7cec672ab36b4dcddaf1331312faae.tar.gz
upstream-b9ebf29fbd7cec672ab36b4dcddaf1331312faae.tar.bz2
upstream-b9ebf29fbd7cec672ab36b4dcddaf1331312faae.zip
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 <nbd@openwrt.org> SVN-Revision: 45920
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic/config-3.181
-rw-r--r--target/linux/generic/config-4.01
-rw-r--r--target/linux/ipq806x/config-3.181
3 files changed, 2 insertions, 1 deletions
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