From f2ee8ac82bc31a10789b78230d384070bc5c8e80 Mon Sep 17 00:00:00 2001 From: Martin Michlmayr Date: Thu, 12 Nov 2009 17:25:49 +0000 Subject: [PATCH] MTD_BLOCK should stay built-in (otherwise upgrades are more difficult) svn path=/dists/trunk/linux-2.6/; revision=14602 --- debian/changelog | 3 +-- debian/config/armel/config.iop32x | 3 +-- debian/config/armel/config.ixp4xx | 3 +-- debian/config/armel/config.kirkwood | 3 +-- debian/config/armel/config.orion5x | 5 ++--- 5 files changed, 6 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index 250b2c7a6..2941192d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,8 +17,7 @@ linux-2.6 (2.6.32~rc6-1) UNRELEASED; urgency=low [ 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). diff --git a/debian/config/armel/config.iop32x b/debian/config/armel/config.iop32x index 6fd3753c8..28e719589 100644 --- a/debian/config/armel/config.iop32x +++ b/debian/config/armel/config.iop32x @@ -383,8 +383,7 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 # 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 diff --git a/debian/config/armel/config.ixp4xx b/debian/config/armel/config.ixp4xx index cdfd74748..8fdf878ff 100644 --- a/debian/config/armel/config.ixp4xx +++ b/debian/config/armel/config.ixp4xx @@ -375,8 +375,7 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 # 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 diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood index 6eebe456f..adb1be3a4 100644 --- a/debian/config/armel/config.kirkwood +++ b/debian/config/armel/config.kirkwood @@ -240,8 +240,7 @@ CONFIG_MTD_PARTITIONS=y # 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 diff --git a/debian/config/armel/config.orion5x b/debian/config/armel/config.orion5x index 2c73abf8c..9b094e6b2 100644 --- a/debian/config/armel/config.orion5x +++ b/debian/config/armel/config.orion5x @@ -226,9 +226,8 @@ CONFIG_MTD_PARTITIONS=y # 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