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

[Martin Michlmayr]

Author: tbm
Date: Fri Oct 30 20:36:29 2009
New Revision: 14526

Log:
unifiy FTL and FTLN

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	Fri Oct 30 20:35:15 2009	(r14525)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Oct 30 20:36:29 2009	(r14526)
@@ -13,7 +13,7 @@
 
   [ Martin Michlmayr ]
   * [arm] Make some options modular (since there's no reason for them to
-    be built in): MTD_BLOCK, MTD_BLOCK_RO.
+    be built in): MTD_BLOCK, MTD_BLOCK_RO, FTL, NFTL.
 
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 26 Oct 2009 01:18:26 +0000
 

Modified: dists/trunk/linux-2.6/debian/config/armel/config.iop32x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.iop32x	Fri Oct 30 20:35:15 2009	(r14525)
+++ dists/trunk/linux-2.6/debian/config/armel/config.iop32x	Fri Oct 30 20:36:29 2009	(r14526)
@@ -385,8 +385,8 @@
 CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLOCK=m
 CONFIG_MTD_BLOCK_RO=m
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
+CONFIG_FTL=m
+CONFIG_NFTL=m
 # CONFIG_INFTL is not set
 # CONFIG_RFD_FTL is not set
 

Modified: dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx	Fri Oct 30 20:35:15 2009	(r14525)
+++ dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx	Fri Oct 30 20:36:29 2009	(r14526)
@@ -377,8 +377,8 @@
 CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLOCK=m
 CONFIG_MTD_BLOCK_RO=m
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
+CONFIG_FTL=m
+CONFIG_NFTL=m
 # CONFIG_INFTL is not set
 CONFIG_RFD_FTL=m
 

Modified: dists/trunk/linux-2.6/debian/config/armel/config.kirkwood
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.kirkwood	Fri Oct 30 20:35:15 2009	(r14525)
+++ dists/trunk/linux-2.6/debian/config/armel/config.kirkwood	Fri Oct 30 20:36:29 2009	(r14526)
@@ -242,8 +242,8 @@
 CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLOCK=m
 CONFIG_MTD_BLOCK_RO=m
-CONFIG_FTL=y
-CONFIG_NFTL=y
+CONFIG_FTL=m
+CONFIG_NFTL=m
 # CONFIG_NFTL_RW is not set
 # CONFIG_INFTL is not set
 # CONFIG_RFD_FTL is not set

Modified: dists/trunk/linux-2.6/debian/config/armel/config.orion5x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.orion5x	Fri Oct 30 20:35:15 2009	(r14525)
+++ dists/trunk/linux-2.6/debian/config/armel/config.orion5x	Fri Oct 30 20:36:29 2009	(r14526)
@@ -231,8 +231,8 @@
 CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=m
 CONFIG_MTD_BLOCK_RO=m
-CONFIG_FTL=y
-CONFIG_NFTL=y
+CONFIG_FTL=m
+CONFIG_NFTL=m
 # CONFIG_NFTL_RW is not set
 # CONFIG_INFTL is not set
 # CONFIG_RFD_FTL is not set