From dead94ce841fd0572affb6f7113b0c1dc0883ada Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Fri, 31 Oct 2014 15:21:59 +0000 Subject: [PATCH] Enable MTD and MTDBLOCK in top-level config. svn path=/dists/sid/linux/; revision=22008 --- debian/changelog | 1 + debian/config/alpha/config | 3 --- debian/config/config | 3 +++ debian/config/kernelarch-mips/config.4kc-malta | 3 --- debian/config/kernelarch-mips/config.5kc-malta | 3 --- debian/config/kernelarch-x86/config | 3 --- 6 files changed, 4 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index 057e68b04..105dbac45 100644 --- a/debian/changelog +++ b/debian/changelog @@ -168,6 +168,7 @@ linux (3.16.7-1) UNRELEASED; urgency=medium * [armhf] Enable various drivers for the Nokia N900. Patch from Sebastian Reichel. (Closes: #766070) * [arm64] Enable EHCI and OHCI platform USB HCD drivers. + * Enable MTD and MTDBLOCK in top-level config. [ Uwe Kleine-Koenig ] * [armhf] enable PCI and NAND driver for Armada 370 diff --git a/debian/config/alpha/config b/debian/config/alpha/config index 1c77b3daa..6e94a000d 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -415,14 +415,11 @@ CONFIG_MMC_BLOCK=m ## ## file: drivers/mtd/Kconfig ## -CONFIG_MTD=m CONFIG_MTD_REDBOOT_PARTS=y CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y CONFIG_MTD_REDBOOT_PARTS_READONLY=y CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_BLOCK=m -CONFIG_MTD_BLOCK_RO=m CONFIG_FTL=m CONFIG_NFTL=m CONFIG_NFTL_RW=y diff --git a/debian/config/config b/debian/config/config index 131110eee..4caa1b36e 100644 --- a/debian/config/config +++ b/debian/config/config @@ -2221,6 +2221,9 @@ CONFIG_MMC_REALTEK_USB=m ## ## file: drivers/mtd/Kconfig ## +CONFIG_MTD=m +CONFIG_MTD_BLOCK=m +CONFIG_MTD_BLOCK_RO=m # CONFIG_MTD_TESTS is not set CONFIG_MTD_AR7_PARTS=m CONFIG_RFD_FTL=m diff --git a/debian/config/kernelarch-mips/config.4kc-malta b/debian/config/kernelarch-mips/config.4kc-malta index aacee7d62..1b7173637 100644 --- a/debian/config/kernelarch-mips/config.4kc-malta +++ b/debian/config/kernelarch-mips/config.4kc-malta @@ -186,10 +186,7 @@ CONFIG_MMC_BLOCK=m ## ## file: drivers/mtd/Kconfig ## -CONFIG_MTD=m CONFIG_MTD_REDBOOT_PARTS=y -CONFIG_MTD_BLOCK=m -CONFIG_MTD_BLOCK_RO=m CONFIG_FTL=m CONFIG_NFTL=m CONFIG_NFTL_RW=y diff --git a/debian/config/kernelarch-mips/config.5kc-malta b/debian/config/kernelarch-mips/config.5kc-malta index 52c525f68..79947a589 100644 --- a/debian/config/kernelarch-mips/config.5kc-malta +++ b/debian/config/kernelarch-mips/config.5kc-malta @@ -189,10 +189,7 @@ CONFIG_MMC_BLOCK=m ## ## file: drivers/mtd/Kconfig ## -CONFIG_MTD=m CONFIG_MTD_REDBOOT_PARTS=y -CONFIG_MTD_BLOCK=m -CONFIG_MTD_BLOCK_RO=m CONFIG_FTL=m CONFIG_NFTL=m CONFIG_NFTL_RW=y diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index 02be2a9b3..3f57b5a2b 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -799,14 +799,11 @@ CONFIG_MMC_SDHCI_ACPI=m ## ## file: drivers/mtd/Kconfig ## -CONFIG_MTD=m CONFIG_MTD_REDBOOT_PARTS=y CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set # CONFIG_MTD_CMDLINE_PARTS is not set -CONFIG_MTD_BLOCK=m -CONFIG_MTD_BLOCK_RO=m CONFIG_FTL=m CONFIG_NFTL=m CONFIG_NFTL_RW=y