[linux] 04/05: [armel/marvell] mtd: Change JFFS2_FS, MTD_SPI_NOR, and M25P80 from built-in to modules

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch master
in repository linux.

commit 8ff6a7a38ad761cbde4a8684e7ebf98486e054ba
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Wed Jan 27 17:08:43 2016 +0000

    [armel/marvell] mtd: Change JFFS2_FS, MTD_SPI_NOR, and M25P80 from built-in to modules
---
 debian/changelog                                         | 1 +
 debian/config/armel/config.marvell                       | 8 +-------
 debian/installer/armel/modules/armel-marvell/mtd-modules | 2 ++
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ce014f6..326a12e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,7 @@ linux (4.4.1-1~exp1) UNRELEASED; urgency=medium
       + Disable MACH_DNS323
       + Change MTD_CFI_AMDSTD from built-in to module
     - input: Disable KEYBOARD_ATKBD
+    - mtd: Change JFFS2_FS, MTD_SPI_NOR, and M25P80 from built-in to modules
 
  -- Ian Campbell <ijc at debian.org>  Sat, 23 Jan 2016 08:23:05 +0000
 
diff --git a/debian/config/armel/config.marvell b/debian/config/armel/config.marvell
index ab11911..588eeb7 100644
--- a/debian/config/armel/config.marvell
+++ b/debian/config/armel/config.marvell
@@ -360,7 +360,6 @@ CONFIG_MTD_CFI_STAA=m
 ## file: drivers/mtd/devices/Kconfig
 ##
 # CONFIG_MTD_PMC551 is not set
-CONFIG_MTD_M25P80=y
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_MTDRAM is not set
@@ -391,7 +390,7 @@ CONFIG_MTD_NAND_ORION=y
 ##
 ## file: drivers/mtd/spi-nor/Kconfig
 ##
-CONFIG_MTD_SPI_NOR=y
+CONFIG_MTD_SPI_NOR=m
 
 ##
 ## file: drivers/net/arcnet/Kconfig
@@ -640,11 +639,6 @@ CONFIG_FB=m
 CONFIG_ORION_WATCHDOG=m
 
 ##
-## file: fs/jffs2/Kconfig
-##
-CONFIG_JFFS2_FS=y
-
-##
 ## file: kernel/trace/Kconfig
 ##
 # CONFIG_FUNCTION_GRAPH_TRACER is not set
diff --git a/debian/installer/armel/modules/armel-marvell/mtd-modules b/debian/installer/armel/modules/armel-marvell/mtd-modules
new file mode 100644
index 0000000..5fcac1e
--- /dev/null
+++ b/debian/installer/armel/modules/armel-marvell/mtd-modules
@@ -0,0 +1,2 @@
+#include <mtd-modules>
+m25p80

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