diff --git a/debian/changelog b/debian/changelog
index c025ab6b3..ccad14afd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,10 @@ linux (3.11~rc7-1~exp2) UNRELEASED; urgency=low
   * [x86] mtd: Disable MTD_NAND_PLATFORM
   * [x86] power: Disable PDA_POWER
   * [x86] video: Disable FB_S1D13XXX
+  * Disable some old non-hotplug PCI drivers:
+    - SCSI: Disable SCSI_AIC7XXX_OLD
+    - [x86] mtd: Disable MTD_PMC551
+    - [x86] net/wan: Disable SBNI
 
  -- Ben Hutchings <ben@decadent.org.uk>  Sun, 01 Sep 2013 18:45:47 +0100
 
diff --git a/debian/config/armel/config b/debian/config/armel/config
index 4af3ecfaf..b4debe9f2 100644
--- a/debian/config/armel/config
+++ b/debian/config/armel/config
@@ -72,7 +72,6 @@ CONFIG_YAM=m
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_SCSI_3W_9XXX is not set
 # CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_AIC7XXX_OLD is not set
 # CONFIG_SCSI_HPTIOP is not set
 
 ##
diff --git a/debian/config/armel/config.ixp4xx b/debian/config/armel/config.ixp4xx
index d5c997f18..2b105ddce 100644
--- a/debian/config/armel/config.ixp4xx
+++ b/debian/config/armel/config.ixp4xx
@@ -550,7 +550,6 @@ CONFIG_RTC_DRV_PCF8563=y
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_SCSI_3W_9XXX is not set
 # CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_AIC7XXX_OLD is not set
 # CONFIG_SCSI_DPT_I2O is not set
 # CONFIG_SCSI_ARCMSR is not set
 # CONFIG_SCSI_HPTIOP is not set
diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood
index f95d00c24..f5230956e 100644
--- a/debian/config/armel/config.kirkwood
+++ b/debian/config/armel/config.kirkwood
@@ -520,7 +520,6 @@ CONFIG_RTC_DRV_MV=y
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_SCSI_3W_9XXX is not set
 # CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_AIC7XXX_OLD is not set
 # CONFIG_SCSI_DPT_I2O is not set
 # CONFIG_SCSI_ARCMSR is not set
 # CONFIG_SCSI_HPTIOP is not set
diff --git a/debian/config/armel/config.mv78xx0 b/debian/config/armel/config.mv78xx0
index ed6ede3e4..6b27795e6 100644
--- a/debian/config/armel/config.mv78xx0
+++ b/debian/config/armel/config.mv78xx0
@@ -438,7 +438,6 @@ CONFIG_RTC_DRV_S35390A=y
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_SCSI_3W_9XXX is not set
 # CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_AIC7XXX_OLD is not set
 # CONFIG_SCSI_DPT_I2O is not set
 # CONFIG_SCSI_ARCMSR is not set
 # CONFIG_SCSI_HPTIOP is not set
diff --git a/debian/config/armel/config.orion5x b/debian/config/armel/config.orion5x
index 5f6e00e81..295bf976d 100644
--- a/debian/config/armel/config.orion5x
+++ b/debian/config/armel/config.orion5x
@@ -457,7 +457,6 @@ CONFIG_RTC_DRV_S35390A=y
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_SCSI_3W_9XXX is not set
 # CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_AIC7XXX_OLD is not set
 # CONFIG_SCSI_DPT_I2O is not set
 # CONFIG_SCSI_ARCMSR is not set
 # CONFIG_SCSI_HPTIOP is not set
diff --git a/debian/config/config b/debian/config/config
index 5eb85a637..397b10cb2 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -3056,7 +3056,7 @@ CONFIG_SCSI_AHA152X=m
 CONFIG_SCSI_AHA1542=m
 CONFIG_SCSI_AHA1740=m
 CONFIG_SCSI_AACRAID=m
-CONFIG_SCSI_AIC7XXX_OLD=m
+# CONFIG_SCSI_AIC7XXX_OLD is not set
 CONFIG_SCSI_MVUMI=m
 CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_HPTIOP=m
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index d7b700a88..7328a6dba 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -812,7 +812,7 @@ CONFIG_MTD_ABSENT=m
 ##
 ## file: drivers/mtd/devices/Kconfig
 ##
-CONFIG_MTD_PMC551=m
+# CONFIG_MTD_PMC551 is not set
 # CONFIG_MTD_PMC551_BUGFIX is not set
 # CONFIG_MTD_PMC551_DEBUG is not set
 CONFIG_MTD_SLRAM=m
@@ -1074,8 +1074,7 @@ CONFIG_DSCC4_PCISYNC=y
 CONFIG_DSCC4_PCI_RST=y
 CONFIG_DLCI=m
 CONFIG_DLCI_MAX=8
-CONFIG_SBNI=m
-# CONFIG_SBNI_MULTILINE is not set
+# CONFIG_SBNI is not set
 
 ##
 ## file: drivers/net/wireless/Kconfig
diff --git a/debian/config/m68k/config b/debian/config/m68k/config
index 773310ab7..decc9f5f2 100644
--- a/debian/config/m68k/config
+++ b/debian/config/m68k/config
@@ -485,7 +485,6 @@ CONFIG_SCSI=y
 CONFIG_SCSI_SPI_ATTRS=m
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_AHA152X is not set
-# CONFIG_SCSI_AIC7XXX_OLD is not set
 # CONFIG_SCSI_ADVANSYS is not set
 # CONFIG_SCSI_UFSHCD is not set
 # CONFIG_LIBFC is not set
diff --git a/debian/config/mips/config.r4k-ip22 b/debian/config/mips/config.r4k-ip22
index 956ce221e..7aa069d66 100644
--- a/debian/config/mips/config.r4k-ip22
+++ b/debian/config/mips/config.r4k-ip22
@@ -367,7 +367,6 @@ CONFIG_BLK_DEV_SR=y
 # CONFIG_SCSI_LOGGING is not set
 CONFIG_SGIWD93_SCSI=y
 # CONFIG_SCSI_AHA1740 is not set
-# CONFIG_SCSI_AIC7XXX_OLD is not set
 # CONFIG_SCSI_IN2000 is not set
 # CONFIG_SCSI_DTC3280 is not set
 # CONFIG_SCSI_FUTURE_DOMAIN is not set
diff --git a/debian/config/mips/config.r5k-ip32 b/debian/config/mips/config.r5k-ip32
index e19f420f8..799819107 100644
--- a/debian/config/mips/config.r5k-ip32
+++ b/debian/config/mips/config.r5k-ip32
@@ -447,7 +447,6 @@ CONFIG_BLK_DEV_SR=y
 # CONFIG_SCSI_3W_9XXX is not set
 # CONFIG_SCSI_ACARD is not set
 # CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_AIC7XXX_OLD is not set
 # CONFIG_SCSI_DMX3191D is not set
 # CONFIG_SCSI_FUTURE_DOMAIN is not set
 # CONFIG_SCSI_IPS is not set