diff --git a/debian/changelog b/debian/changelog
index 2560ad28d..1b5a1aceb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,7 +19,7 @@ linux-2.6 (2.6.31~rc3-1~experimental.1) UNRELEASED; urgency=low
   * Disable v4l1 ov511 and quickcam_messenger drivers.
   * [x86_64] Enable HW_RANDOM_VIA.
   * [x86] Keep divers staging stuff enabled.
-  * [x86] Enable RT3070.
+  * [x86] Enable RT3070, COMEDI_PCMCIA_DRIVERS.
 
   [ Ben Hutchings ]
   * mga: remove unnecessary change from firmware-loading patch
diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index b842a48ed..c4280a586 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -943,14 +943,6 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
 CONFIG_SERIAL_8250_RSA=y
 CONFIG_SERIAL_JSM=m
 
-##
-## file: drivers/staging/comedi/Kconfig
-##
-CONFIG_COMEDI=m
-# CONFIG_COMEDI_DEBUG is not set
-CONFIG_COMEDI_PCI_DRIVERS=m
-CONFIG_COMEDI_USB_DRIVERS=m
-
 ##
 ## file: drivers/telephony/Kconfig
 ##
diff --git a/debian/config/i386/config b/debian/config/i386/config
index 5378bcd96..0c11c5a53 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -1113,14 +1113,6 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
 CONFIG_SERIAL_8250_RSA=y
 CONFIG_SERIAL_JSM=m
 
-##
-## file: drivers/staging/comedi/Kconfig
-##
-CONFIG_COMEDI=m
-# CONFIG_COMEDI_DEBUG is not set
-CONFIG_COMEDI_PCI_DRIVERS=m
-CONFIG_COMEDI_USB_DRIVERS=m
-
 ##
 ## file: drivers/telephony/Kconfig
 ##
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index b8b6b016c..e251d1372 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -213,7 +213,11 @@ CONFIG_STAGING=y
 ##
 ## file: drivers/staging/comedi/Kconfig
 ##
-# CONFIG_COMEDI is not set
+CONFIG_COMEDI=m
+# CONFIG_COMEDI_DEBUG is not set
+CONFIG_COMEDI_PCI_DRIVERS=m
+CONFIG_COMEDI_PCMCIA_DRIVERS=m
+CONFIG_COMEDI_USB_DRIVERS=m
 
 ##
 ## file: drivers/staging/dst/Kconfig