[kernel] r14602 - in dists/trunk/linux-2.6/debian: . config/armel

[Martin Michlmayr]

Author: tbm
Date: Thu Nov 12 17:25:49 2009
New Revision: 14602

Log:
MTD_BLOCK should stay built-in (otherwise upgrades are more difficult)

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/armel/config.iop32x
   dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx
   dists/trunk/linux-2.6/debian/config/armel/config.kirkwood
   dists/trunk/linux-2.6/debian/config/armel/config.orion5x

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Thu Nov 12 11:10:29 2009	(r14601)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Nov 12 17:25:49 2009	(r14602)
@@ -17,8 +17,7 @@
 
   [ Martin Michlmayr ]
   * [arm] Make some options modular (since there's no reason for them to
-    be built in): MTD_BLOCK, MTD_BLOCK_RO, FTL, NFTL, MTD_CFI_AMDSTD,
-    MTD_CFI_STAA.
+    be built in): FTL, NFTL, MTD_CFI_AMDSTD, MTD_CFI_STAA.
   * [arm] Turn off options that are not needed: MTD_CMDLINE_PARTS
   * [armel/orion5x, armel/kirkwood] Enable ISDN (requested by Markus
     Krebs).

Modified: dists/trunk/linux-2.6/debian/config/armel/config.iop32x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.iop32x	Thu Nov 12 11:10:29 2009	(r14601)
+++ dists/trunk/linux-2.6/debian/config/armel/config.iop32x	Thu Nov 12 17:25:49 2009	(r14602)
@@ -383,8 +383,7 @@
 # CONFIG_MTD_CMDLINE_PARTS is not set
 # CONFIG_MTD_AFS_PARTS is not set
 CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLOCK=m
-CONFIG_MTD_BLOCK_RO=m
+CONFIG_MTD_BLOCK=y
 CONFIG_FTL=m
 CONFIG_NFTL=m
 # CONFIG_INFTL is not set

Modified: dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx	Thu Nov 12 11:10:29 2009	(r14601)
+++ dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx	Thu Nov 12 17:25:49 2009	(r14602)
@@ -375,8 +375,7 @@
 # CONFIG_MTD_CMDLINE_PARTS is not set
 # CONFIG_MTD_AFS_PARTS is not set
 CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLOCK=m
-CONFIG_MTD_BLOCK_RO=m
+CONFIG_MTD_BLOCK=y
 CONFIG_FTL=m
 CONFIG_NFTL=m
 # CONFIG_INFTL is not set

Modified: dists/trunk/linux-2.6/debian/config/armel/config.kirkwood
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.kirkwood	Thu Nov 12 11:10:29 2009	(r14601)
+++ dists/trunk/linux-2.6/debian/config/armel/config.kirkwood	Thu Nov 12 17:25:49 2009	(r14602)
@@ -240,8 +240,7 @@
 # CONFIG_MTD_CMDLINE_PARTS is not set
 # CONFIG_MTD_AFS_PARTS is not set
 CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLOCK=m
-CONFIG_MTD_BLOCK_RO=m
+CONFIG_MTD_BLOCK=y
 CONFIG_FTL=m
 CONFIG_NFTL=m
 # CONFIG_NFTL_RW is not set

Modified: dists/trunk/linux-2.6/debian/config/armel/config.orion5x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.orion5x	Thu Nov 12 11:10:29 2009	(r14601)
+++ dists/trunk/linux-2.6/debian/config/armel/config.orion5x	Thu Nov 12 17:25:49 2009	(r14602)
@@ -226,9 +226,8 @@
 # CONFIG_MTD_CMDLINE_PARTS is not set
 # CONFIG_MTD_AFS_PARTS is not set
 CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLKDEVS=m
-CONFIG_MTD_BLOCK=m
-CONFIG_MTD_BLOCK_RO=m
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
 CONFIG_FTL=m
 CONFIG_NFTL=m
 # CONFIG_NFTL_RW is not set