diff --git a/debian/changelog b/debian/changelog
index c6fe79bf9..3ef4d0344 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,10 @@ linux-2.6 (2.6.32~rc5-1) UNRELEASED; urgency=low
   * Enable PERF_EVENTS, EVENT_PROFILE, CRYPTO_VMAC, CRYPTO_GHASH, TREE_RCU.
   * Use SLUB as default SLAB allocator.
 
+  [ Martin Michlmayr ]
+  * [arm] Make some options modular (since there's no reason for them to
+    be built in): MTD_BLOCK, MTD_BLOCK_RO.
+
  -- Ben Hutchings <ben@decadent.org.uk>  Mon, 26 Oct 2009 01:18:26 +0000
 
 linux-2.6 (2.6.31-1) unstable; urgency=low
diff --git a/debian/config/armel/config.iop32x b/debian/config/armel/config.iop32x
index 77f840ede..d89c6bb6c 100644
--- a/debian/config/armel/config.iop32x
+++ b/debian/config/armel/config.iop32x
@@ -383,7 +383,8 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 CONFIG_MTD_CMDLINE_PARTS=y
 # CONFIG_MTD_AFS_PARTS is not set
 CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLOCK=y
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
 # CONFIG_FTL is not set
 # CONFIG_NFTL is not set
 # CONFIG_INFTL is not set
diff --git a/debian/config/armel/config.ixp4xx b/debian/config/armel/config.ixp4xx
index a5318c7d1..bc4ddb358 100644
--- a/debian/config/armel/config.ixp4xx
+++ b/debian/config/armel/config.ixp4xx
@@ -375,7 +375,8 @@ 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=y
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
 # CONFIG_FTL is not set
 # CONFIG_NFTL is not set
 # CONFIG_INFTL is not set
diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood
index 345870863..483c0f589 100644
--- a/debian/config/armel/config.kirkwood
+++ b/debian/config/armel/config.kirkwood
@@ -240,8 +240,8 @@ CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD_CMDLINE_PARTS=y
 # CONFIG_MTD_AFS_PARTS is not set
 CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
 CONFIG_FTL=y
 CONFIG_NFTL=y
 # CONFIG_NFTL_RW is not set
diff --git a/debian/config/armel/config.orion5x b/debian/config/armel/config.orion5x
index 4bfb54b6b..82f7be28b 100644
--- a/debian/config/armel/config.orion5x
+++ b/debian/config/armel/config.orion5x
@@ -229,7 +229,8 @@ CONFIG_MTD_CMDLINE_PARTS=y
 # CONFIG_MTD_AFS_PARTS is not set
 CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
 CONFIG_FTL=y
 CONFIG_NFTL=y
 # CONFIG_NFTL_RW is not set