diff --git a/debian/arch/mips/config.sb1-bcm91250a b/debian/arch/mips/config.sb1-bcm91250a
index c2b2c880b..73a2d4104 100644
--- a/debian/arch/mips/config.sb1-bcm91250a
+++ b/debian/arch/mips/config.sb1-bcm91250a
@@ -680,7 +680,7 @@ CONFIG_SCSI_DEBUG=m
 #
 # Serial ATA (prod) and Parallel ATA (experimental) drivers
 #
-CONFIG_ATA=y
+CONFIG_ATA=m
 CONFIG_SATA_AHCI=m
 CONFIG_SATA_SVW=m
 CONFIG_ATA_PIIX=m
diff --git a/debian/arch/mips/config.sb1a-bcm91480b b/debian/arch/mips/config.sb1a-bcm91480b
index fcb492362..cae3e7930 100644
--- a/debian/arch/mips/config.sb1a-bcm91480b
+++ b/debian/arch/mips/config.sb1a-bcm91480b
@@ -676,7 +676,7 @@ CONFIG_SCSI_DEBUG=m
 #
 # Serial ATA (prod) and Parallel ATA (experimental) drivers
 #
-CONFIG_ATA=y
+CONFIG_ATA=m
 CONFIG_SATA_AHCI=m
 CONFIG_SATA_SVW=m
 CONFIG_ATA_PIIX=m
diff --git a/debian/arch/mipsel/config.sb1-bcm91250a b/debian/arch/mipsel/config.sb1-bcm91250a
index d553b98ac..49b638ecc 100644
--- a/debian/arch/mipsel/config.sb1-bcm91250a
+++ b/debian/arch/mipsel/config.sb1-bcm91250a
@@ -680,7 +680,7 @@ CONFIG_SCSI_DEBUG=m
 #
 # Serial ATA (prod) and Parallel ATA (experimental) drivers
 #
-CONFIG_ATA=y
+CONFIG_ATA=m
 CONFIG_SATA_AHCI=m
 CONFIG_SATA_SVW=m
 CONFIG_ATA_PIIX=m
diff --git a/debian/arch/mipsel/config.sb1a-bcm91480b b/debian/arch/mipsel/config.sb1a-bcm91480b
index 05a7c16d2..80a1f9f6f 100644
--- a/debian/arch/mipsel/config.sb1a-bcm91480b
+++ b/debian/arch/mipsel/config.sb1a-bcm91480b
@@ -676,7 +676,7 @@ CONFIG_SCSI_DEBUG=m
 #
 # Serial ATA (prod) and Parallel ATA (experimental) drivers
 #
-CONFIG_ATA=y
+CONFIG_ATA=m
 CONFIG_SATA_AHCI=m
 CONFIG_SATA_SVW=m
 CONFIG_ATA_PIIX=m
diff --git a/debian/changelog b/debian/changelog
index de6c3f838..1e1140d4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ linux-2.6 (2.6.21-1~experimental.1) UNRELEASED; urgency=low
   * Mark CHELSIO_T3 as broken on ARM.
   * Take arch/arm/tools/mach-types from current git to fix build failure
     because MACH_TYPE_EP80219 is not defined.
+  * mips/sb1: Don't build CONFIG_ATA into the kernel.
 
  -- maximilian attems <maks@debian.org>  Tue, 10 Apr 2007 14:42:30 +0200