[linux] 01/01: [armel] Change NAND related stuff to modules

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

rosh-guest pushed a commit to branch rosh/strip_armel
in repository linux.

commit d7f8738db2f9a1dfb7490492d59d6f907803cff8
Author: Roger Shimizu <rogershimizu at gmail.com>
Date:   Mon Jul 31 23:34:47 2017 +0900

    [armel] Change NAND related stuff to modules
    
    Change MTD_CFI, MTD_JEDECPROBE, MTD_CFI_INTELEXT, MTD_CFI_AMDSTD,
    and MTD_NAND MTD_NAND_ORION from built-in to modules (fixes FTBFS)
---
 debian/config/armel/config.marvell                       | 12 ++++++------
 debian/installer/armel/modules/armel-marvell/mtd-modules |  5 +++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/debian/config/armel/config.marvell b/debian/config/armel/config.marvell
index 186ce11..0c30597 100644
--- a/debian/config/armel/config.marvell
+++ b/debian/config/armel/config.marvell
@@ -363,8 +363,8 @@ CONFIG_NFTL=m
 ##
 ## file: drivers/mtd/chips/Kconfig
 ##
-CONFIG_MTD_CFI=y
-CONFIG_MTD_JEDECPROBE=y
+CONFIG_MTD_CFI=m
+CONFIG_MTD_JEDECPROBE=m
 CONFIG_MTD_CFI_ADV_OPTIONS=y
 ## choice: Flash cmd/query data swapping
 CONFIG_MTD_CFI_NOSWAP=y
@@ -384,9 +384,9 @@ CONFIG_MTD_CFI_I4=y
 # CONFIG_MTD_CFI_I8 is not set
 # CONFIG_MTD_OTP is not set
 #. Needed e.g. on QNAP devices
-CONFIG_MTD_CFI_INTELEXT=y
+CONFIG_MTD_CFI_INTELEXT=m
 #. Needed e.g. on D-Link DNS-323, Buffalo KuroBox-Pro, Buffalo Linkstation LS-GL / LS-WTGL, etc
-CONFIG_MTD_CFI_AMDSTD=y
+CONFIG_MTD_CFI_AMDSTD=m
 CONFIG_MTD_CFI_STAA=m
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
@@ -413,10 +413,10 @@ CONFIG_MTD_PHYSMAP_OF=y
 ##
 ## file: drivers/mtd/nand/Kconfig
 ##
-CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND=m
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_CAFE is not set
-CONFIG_MTD_NAND_ORION=y
+CONFIG_MTD_NAND_ORION=m
 
 ##
 ## file: drivers/mtd/onenand/Kconfig
diff --git a/debian/installer/armel/modules/armel-marvell/mtd-modules b/debian/installer/armel/modules/armel-marvell/mtd-modules
index 5fcac1e..a26280d 100644
--- a/debian/installer/armel/modules/armel-marvell/mtd-modules
+++ b/debian/installer/armel/modules/armel-marvell/mtd-modules
@@ -1,2 +1,7 @@
 #include <mtd-modules>
 m25p80
+cfi_probe
+gen_probe
+jedec_probe
+nand
+orion_nand

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git