diff --git a/debian/arch/alpha/config b/debian/arch/alpha/config
index 6473a32cd..c630f2e11 100644
--- a/debian/arch/alpha/config
+++ b/debian/arch/alpha/config
@@ -1378,9 +1378,6 @@ CONFIG_MMC=m
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_BLOCK=m
 CONFIG_MMC_WBSD=m
-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_MTHCA=m
-CONFIG_INFINIBAND_IPOIB=m
 CONFIG_EXT2_FS=y
 CONFIG_JBD=m
 CONFIG_FS_MBCACHE=y
diff --git a/debian/arch/amd64/config b/debian/arch/amd64/config
index dbb07c211..7fa9da9e5 100644
--- a/debian/arch/amd64/config
+++ b/debian/arch/amd64/config
@@ -1255,9 +1255,6 @@ CONFIG_MMC=m
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_BLOCK=m
 CONFIG_MMC_WBSD=m
-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_MTHCA=m
-CONFIG_INFINIBAND_IPOIB=m
 CONFIG_EDD=m
 CONFIG_JBD=m
 CONFIG_XFS_RT=y
diff --git a/debian/arch/config b/debian/arch/config
index dfe3a3fbe..d4572f8c7 100644
--- a/debian/arch/config
+++ b/debian/arch/config
@@ -393,6 +393,25 @@ CONFIG_VIDEO_USBVIDEO=m
 CONFIG_VIDEO_OVCAMCHIP=m
 CONFIG_USB_ZR364XX=m
 
+#
+# InfiniBand support
+#
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_ADDR_TRANS=y
+CONFIG_INFINIBAND_MTHCA=m
+CONFIG_INFINIBAND_MTHCA_DEBUG=y
+CONFIG_INFINIBAND_AMSO1100=m
+# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
+# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
+CONFIG_INFINIBAND_IPATH=m
+CONFIG_INFINIBAND_IPOIB=m
+# CONFIG_INFINIBAND_IPOIB_CM is not set
+CONFIG_INFINIBAND_IPOIB_DEBUG=y
+CONFIG_INFINIBAND_SRP=m
+CONFIG_INFINIBAND_ISER=m
+
 CONFIG_MTD_PLATRAM=m
 CONFIG_USB_XUSBATM=m
 CONFIG_PCMCIA_LOAD_CIS=y
@@ -806,7 +825,6 @@ CONFIG_MARVELL_PHY=m
 CONFIG_TEXTSEARCH_BM=m
 CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_USB_NET_GL620A=m
-CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_IP6_NF_TARGET_REJECT=m
 CONFIG_HOSTAP_PLX=m
 CONFIG_IEEE80211_CRYPT_WEP=m
@@ -817,7 +835,6 @@ CONFIG_NETFILTER_NETLINK=m
 CONFIG_INET_DIAG=m
 CONFIG_HOSTAP_FIRMWARE=y
 CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_INFINIBAND_USER_ACCESS=m
 CONFIG_HOSTAP=m
 CONFIG_IPW2200=m
 # CONFIG_LOCALVERSION_AUTO is not set
@@ -847,7 +864,6 @@ CONFIG_GENERIC_PENDING_IRQ=y
 CONFIG_SECURITY_NETWORK=y
 CONFIG_XFS_QUOTA=y
 CONFIG_MTD_ONENAND_VERIFY_WRITE=y
-CONFIG_INFINIBAND_SRP=m
 # CONFIG_JFFS2_SUMMARY is not set
 CONFIG_MTD_ONENAND=m
 CONFIG_PPP_MPPE=m
@@ -972,7 +988,6 @@ CONFIG_USB_SERIAL_NAVMAN=m
 CONFIG_NETFILTER_XT_MATCH_POLICY=m
 # CONFIG_RTC_DRV_TEST is not set
 CONFIG_W1_MASTER_MATROX=m
-CONFIG_INFINIBAND_IPATH=m
 
 #
 ## RTC interfaces
@@ -1025,9 +1040,6 @@ CONFIG_SND_ALS300=m
 # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
 CONFIG_IP_DCCP_ACKVEC=y
 CONFIG_USB_SERIAL_FUNSOFT=m
-# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
-CONFIG_INFINIBAND_IPOIB_DEBUG=y
-CONFIG_INFINIBAND_MTHCA_DEBUG=y
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_DEBUG_KERNEL is not set
 CONFIG_DEBUG_FS=y
@@ -1083,7 +1095,6 @@ CONFIG_PLIST=y
 CONFIG_W1_CON=y
 CONFIG_INOTIFY_USER=y
 CONFIG_RTC_DRV_V3020=m
-CONFIG_INFINIBAND_ADDR_TRANS=y
 CONFIG_ACPI_DOCK=m
 CONFIG_USB_APPLEDISPLAY=m
 CONFIG_SMSC_PHY=m
@@ -1154,7 +1165,6 @@ CONFIG_HW_RANDOM=y
 CONFIG_SND_MIA=m
 CONFIG_MCS_FIR=m
 # CONFIG_IPW2200_PROMISCUOUS is not set
-CONFIG_INFINIBAND_ISER=m
 CONFIG_NETFILTER_XT_MATCH_QUOTA=m
 CONFIG_DVB_LNBP21=m
 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
@@ -1252,9 +1262,7 @@ CONFIG_EXT4DEV_FS=m
 CONFIG_SGI_IOC4=m
 CONFIG_FB_INTEL_I2C=y
 CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
-CONFIG_INFINIBAND_AMSO1100=m
 CONFIG_DEFAULT_TCP_CONG="bic"
-# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
 CONFIG_SYSCTL_SYSCALL=y
 # CONFIG_DEBUG_LIST is not set
 CONFIG_KEYBOARD_STOWAWAY=m
diff --git a/debian/arch/hppa/config b/debian/arch/hppa/config
index 9bc595ad7..66784c60f 100644
--- a/debian/arch/hppa/config
+++ b/debian/arch/hppa/config
@@ -668,9 +668,6 @@ CONFIG_USB_MOUSE=m
 # CONFIG_USB_SISUSBVGA is not set
 # CONFIG_USB_GADGET is not set
 # CONFIG_MMC is not set
-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_MTHCA=m
-CONFIG_INFINIBAND_IPOIB=m
 CONFIG_EXT2_FS=y
 CONFIG_JBD=m
 # CONFIG_JBD_DEBUG is not set
diff --git a/debian/arch/i386/config b/debian/arch/i386/config
index 8bc8af1fe..66fbc23a4 100644
--- a/debian/arch/i386/config
+++ b/debian/arch/i386/config
@@ -1480,9 +1480,6 @@ CONFIG_MMC=m
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_BLOCK=m
 CONFIG_MMC_WBSD=m
-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_MTHCA=m
-CONFIG_INFINIBAND_IPOIB=m
 CONFIG_JBD=m
 CONFIG_XFS_RT=y
 # CONFIG_HUGETLBFS is not set
diff --git a/debian/arch/ia64/config b/debian/arch/ia64/config
index dfc98bcca..5afb11c51 100644
--- a/debian/arch/ia64/config
+++ b/debian/arch/ia64/config
@@ -1086,9 +1086,6 @@ CONFIG_USB_TEST=m
 CONFIG_MMC=m
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_BLOCK=m
-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_MTHCA=m
-CONFIG_INFINIBAND_IPOIB=m
 CONFIG_SGI_IOC4=m
 CONFIG_SGI_IOC3=m
 CONFIG_JBD=m
diff --git a/debian/arch/mips/config.4kc-malta b/debian/arch/mips/config.4kc-malta
index fe3b3a5cb..0de096588 100644
--- a/debian/arch/mips/config.4kc-malta
+++ b/debian/arch/mips/config.4kc-malta
@@ -2719,19 +2719,6 @@ CONFIG_MMC_TIFM_SD=m
 #
 # InfiniBand support
 #
-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-CONFIG_INFINIBAND_ADDR_TRANS=y
-CONFIG_INFINIBAND_MTHCA=m
-# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
-CONFIG_INFINIBAND_AMSO1100=m
-# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
-CONFIG_INFINIBAND_IPOIB=m
-CONFIG_INFINIBAND_IPOIB_DEBUG=y
-# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
-CONFIG_INFINIBAND_SRP=m
-CONFIG_INFINIBAND_ISER=m
 
 #
 # EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
diff --git a/debian/arch/mipsel/config.4kc-malta b/debian/arch/mipsel/config.4kc-malta
index 51b177e58..6646aef5f 100644
--- a/debian/arch/mipsel/config.4kc-malta
+++ b/debian/arch/mipsel/config.4kc-malta
@@ -2719,19 +2719,6 @@ CONFIG_MMC_TIFM_SD=m
 #
 # InfiniBand support
 #
-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-CONFIG_INFINIBAND_ADDR_TRANS=y
-CONFIG_INFINIBAND_MTHCA=m
-# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
-CONFIG_INFINIBAND_AMSO1100=m
-# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
-CONFIG_INFINIBAND_IPOIB=m
-CONFIG_INFINIBAND_IPOIB_DEBUG=y
-# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
-CONFIG_INFINIBAND_SRP=m
-CONFIG_INFINIBAND_ISER=m
 
 #
 # EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
diff --git a/debian/arch/powerpc/config b/debian/arch/powerpc/config
index 005e348f5..be30cde5a 100644
--- a/debian/arch/powerpc/config
+++ b/debian/arch/powerpc/config
@@ -1078,9 +1078,6 @@ CONFIG_MMC=m
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_BLOCK=m
 CONFIG_MMC_WBSD=m
-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_MTHCA=m
-CONFIG_INFINIBAND_IPOIB=m
 CONFIG_JBD=m
 CONFIG_FS_MBCACHE=m
 CONFIG_ADFS_FS=m
diff --git a/debian/changelog b/debian/changelog
index 169bdfc16..5936a18e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,8 @@ linux-2.6 (2.6.22~rc2-1~experimental.1) UNRELEASED; urgency=low
   [ maximilian attems ]
   * Cleanup configs of old unused variables.
   * Enable TCP_CONG_YEAH, TCP_CONG_ILLINOIS, NF_CONNTRACK_SANE, DM_DELAY,
-    GIGASET_M101, SATA_INIC162X, VIDEO_IVTV, USB_ZR364XX and disable
-    SCSI_ESP_CORE in topconfig.
+    GIGASET_M101, SATA_INIC162X, VIDEO_IVTV, USB_ZR364XX, INFINIBAND_CXGB3,
+    MLX4_INFINIBAND and disable SCSI_ESP_CORE in topconfig.
   * [amd64, i386]: Take care of the renaming acpi-ibm to thinkpad-acpi.
     Enable KINGSUN_DONGLE, AF_RXRPC, RXKAD, MTD_NAND_PLATFORM, BLINK, PHANTOM.
     Disable OSS_OBSOLETE.
@@ -27,7 +27,7 @@ linux-2.6 (2.6.22~rc2-1~experimental.1) UNRELEASED; urgency=low
   [ dann frazier ]
   * Add Xen licensing info to the copyright file. (closes: #368912)
 
- -- maximilian attems <maks@debian.org>  Thu, 24 May 2007 10:50:47 +0200
+ -- maximilian attems <maks@debian.org>  Thu, 24 May 2007 11:18:21 +0200
 
 linux-2.6 (2.6.21-3) UNRELEASED; urgency=low