diff --git a/debian/changelog b/debian/changelog
index 6bdfb147a..5a5845999 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ linux-2.6 (2.6.33-1~experimental.5) UNRELEASED; urgency=low
   [ Aurelien Jarno ]
   * Add support for sh4 architecture, patch by Nobuhiro Iwamatsu
     (Closes: #569034)
+  * [mips*/*malta] Remove options that are present in topconfig.
 
  -- Ian Campbell <ijc@hellion.org.uk>  Sat, 27 Mar 2010 08:09:28 +0000
 
diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta
index b8e1b8b51..9de968ea3 100644
--- a/debian/config/mips/config.4kc-malta
+++ b/debian/config/mips/config.4kc-malta
@@ -536,141 +536,6 @@ CONFIG_ISDN_DIVERSION=m
 ##
 # CONFIG_NEW_LEDS is not set
 
-##
-## file: drivers/media/Kconfig
-##
-CONFIG_DVB_CORE=m
-
-##
-## file: drivers/media/dvb/frontends/Kconfig
-##
-# CONFIG_DVB_FE_CUSTOMISE is not set
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TUA6100=m
-CONFIG_DVB_PLL=m
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_ISL6421=m
-
-##
-## file: drivers/media/radio/Kconfig
-##
-CONFIG_RADIO_GEMTEK_PCI=m
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_MAESTRO=m
-CONFIG_USB_DSBR=m
-
-##
-## file: drivers/media/video/Kconfig
-##
-# CONFIG_VIDEO_ADV_DEBUG is not set
-CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-CONFIG_VIDEO_TVAUDIO=m
-CONFIG_VIDEO_TDA7432=m
-CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TDA9875=m
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_SAA6588=m
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_OV7670=m
-CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_VPX3220=m
-CONFIG_VIDEO_CX2341X=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-CONFIG_VIDEO_VIVI=m
-CONFIG_VIDEO_BWQCAM=m
-CONFIG_VIDEO_CQCAM=m
-CONFIG_VIDEO_W9966=m
-CONFIG_VIDEO_CPIA=m
-CONFIG_VIDEO_CPIA_PP=m
-CONFIG_VIDEO_CPIA_USB=m
-CONFIG_VIDEO_SAA5246A=m
-CONFIG_VIDEO_SAA5249=m
-CONFIG_VIDEO_STRADIS=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_CAFE_CCIC=m
-CONFIG_VIDEO_OVCAMCHIP=m
-
-##
-## file: drivers/media/video/bt8xx/Kconfig
-##
-CONFIG_VIDEO_BT848=m
-CONFIG_VIDEO_BT848_DVB=y
-
-##
-## file: drivers/media/video/cpia2/Kconfig
-##
-CONFIG_VIDEO_CPIA2=m
-
-##
-## file: drivers/media/video/cx25840/Kconfig
-##
-CONFIG_VIDEO_CX25840=m
-
-##
-## file: drivers/media/video/cx88/Kconfig
-##
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_VP3054=m
-
-##
-## file: drivers/media/video/em28xx/Kconfig
-##
-CONFIG_VIDEO_EM28XX=m
-
-##
-## file: drivers/media/video/et61x251/Kconfig
-##
-CONFIG_USB_ET61X251=m
-
-##
-## file: drivers/media/video/pvrusb2/Kconfig
-##
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-
-##
-## file: drivers/media/video/saa7134/Kconfig
-##
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_DVB=m
-
-##
-## file: drivers/media/video/usbvision/Kconfig
-##
-CONFIG_VIDEO_USBVISION=m
-
-##
-## file: drivers/media/video/zc0301/Kconfig
-##
-CONFIG_USB_ZC0301=m
-
-##
-## file: drivers/media/video/zoran/Kconfig
-##
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
-
 ##
 ## file: drivers/message/i2o/Kconfig
 ##
@@ -1260,30 +1125,6 @@ CONFIG_AX25=m
 CONFIG_NETROM=m
 CONFIG_ROSE=m
 
-##
-## file: net/bridge/netfilter/Kconfig
-##
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_ULOG=m
-
 ##
 ## file: net/decnet/Kconfig
 ##
@@ -1433,11 +1274,3 @@ CONFIG_SND_YMFPCI=m
 ## file: sound/pci/hda/Kconfig
 ##
 CONFIG_SND_HDA_INTEL=m
-
-##
-## file: unknown
-##
-# CONFIG_MARKEINS is not set
-# CONFIG_MIPS_ATLAS is not set
-# CONFIG_MIPS_SEAD is not set
-
diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta
index 1643f323b..41e591cdd 100644
--- a/debian/config/mips/config.5kc-malta
+++ b/debian/config/mips/config.5kc-malta
@@ -233,13 +233,6 @@ CONFIG_IPMI_POWEROFF=m
 ##
 # CONFIG_TCG_TPM is not set
 
-##
-## file: drivers/firewire/Kconfig
-##
-CONFIG_FIREWIRE=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-
 ##
 ## file: drivers/gpu/drm/Kconfig
 ##
@@ -379,54 +372,6 @@ CONFIG_BLK_DEV_SIIMAGE=y
 ##
 # CONFIG_IEEE1394 is not set
 
-##
-## file: drivers/infiniband/Kconfig
-##
-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-
-##
-## file: drivers/infiniband/hw/amso1100/Kconfig
-##
-CONFIG_INFINIBAND_AMSO1100=m
-# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
-
-##
-## file: drivers/infiniband/hw/cxgb3/Kconfig
-##
-CONFIG_INFINIBAND_CXGB3=m
-# CONFIG_INFINIBAND_CXGB3_DEBUG is not set
-
-##
-## file: drivers/infiniband/hw/mlx4/Kconfig
-##
-CONFIG_MLX4_INFINIBAND=m
-
-##
-## file: drivers/infiniband/hw/mthca/Kconfig
-##
-CONFIG_INFINIBAND_MTHCA=m
-CONFIG_INFINIBAND_MTHCA_DEBUG=y
-
-##
-## file: drivers/infiniband/ulp/ipoib/Kconfig
-##
-CONFIG_INFINIBAND_IPOIB=m
-# CONFIG_INFINIBAND_IPOIB_CM is not set
-CONFIG_INFINIBAND_IPOIB_DEBUG=y
-# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
-
-##
-## file: drivers/infiniband/ulp/iser/Kconfig
-##
-CONFIG_INFINIBAND_ISER=m
-
-##
-## file: drivers/infiniband/ulp/srp/Kconfig
-##
-CONFIG_INFINIBAND_SRP=m
-
 ##
 ## file: drivers/input/gameport/Kconfig
 ##
@@ -593,262 +538,6 @@ CONFIG_ISDN_DIVERSION=m
 ##
 # CONFIG_NEW_LEDS is not set
 
-##
-## file: drivers/media/Kconfig
-##
-CONFIG_DVB_CORE=m
-
-##
-## file: drivers/media/dvb/Kconfig
-##
-CONFIG_DVB_CAPTURE_DRIVERS=y
-
-##
-## file: drivers/media/dvb/b2c2/Kconfig
-##
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
-
-##
-## file: drivers/media/dvb/bt8xx/Kconfig
-##
-CONFIG_DVB_BT8XX=m
-
-##
-## file: drivers/media/dvb/dvb-usb/Kconfig
-##
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-
-##
-## file: drivers/media/dvb/frontends/Kconfig
-##
-# CONFIG_DVB_FE_CUSTOMISE is not set
-CONFIG_DVB_CX24110=m
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TUA6100=m
-CONFIG_DVB_SP8870=m
-CONFIG_DVB_SP887X=m
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX22702=m
-CONFIG_DVB_L64781=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DVB_DIB3000MB=m
-CONFIG_DVB_DIB3000MC=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_OR51211=m
-CONFIG_DVB_OR51132=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_PLL=m
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_ISL6421=m
-
-##
-## file: drivers/media/dvb/pluto2/Kconfig
-##
-CONFIG_DVB_PLUTO2=m
-
-##
-## file: drivers/media/dvb/ttpci/Kconfig
-##
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_CI=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_PATCH=m
-
-##
-## file: drivers/media/dvb/ttusb-budget/Kconfig
-##
-CONFIG_DVB_TTUSB_BUDGET=m
-
-##
-## file: drivers/media/dvb/ttusb-dec/Kconfig
-##
-CONFIG_DVB_TTUSB_DEC=m
-
-##
-## file: drivers/media/radio/Kconfig
-##
-CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_GEMTEK_PCI=m
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_MAESTRO=m
-CONFIG_USB_DSBR=m
-
-##
-## file: drivers/media/video/Kconfig
-##
-CONFIG_VIDEO_CAPTURE_DRIVERS=y
-# CONFIG_VIDEO_ADV_DEBUG is not set
-CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-CONFIG_VIDEO_TVAUDIO=m
-CONFIG_VIDEO_TDA7432=m
-CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TDA9875=m
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_WM8739=m
-CONFIG_VIDEO_SAA6588=m
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_OV7670=m
-CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_VPX3220=m
-CONFIG_VIDEO_CX2341X=m
-CONFIG_VIDEO_SAA7127=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-CONFIG_VIDEO_UPD64031A=m
-CONFIG_VIDEO_UPD64083=m
-CONFIG_VIDEO_VIVI=m
-CONFIG_VIDEO_BWQCAM=m
-CONFIG_VIDEO_CQCAM=m
-CONFIG_VIDEO_W9966=m
-CONFIG_VIDEO_CPIA=m
-CONFIG_VIDEO_CPIA_PP=m
-CONFIG_VIDEO_CPIA_USB=m
-CONFIG_VIDEO_SAA5246A=m
-CONFIG_VIDEO_SAA5249=m
-CONFIG_VIDEO_STRADIS=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_CAFE_CCIC=m
-CONFIG_V4L_USB_DRIVERS=y
-CONFIG_VIDEO_OVCAMCHIP=m
-
-##
-## file: drivers/media/video/bt8xx/Kconfig
-##
-CONFIG_VIDEO_BT848=m
-CONFIG_VIDEO_BT848_DVB=y
-
-##
-## file: drivers/media/video/cpia2/Kconfig
-##
-CONFIG_VIDEO_CPIA2=m
-
-##
-## file: drivers/media/video/cx25840/Kconfig
-##
-CONFIG_VIDEO_CX25840=m
-
-##
-## file: drivers/media/video/cx88/Kconfig
-##
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_VP3054=m
-
-##
-## file: drivers/media/video/em28xx/Kconfig
-##
-CONFIG_VIDEO_EM28XX=m
-
-##
-## file: drivers/media/video/et61x251/Kconfig
-##
-CONFIG_USB_ET61X251=m
-
-##
-## file: drivers/media/video/ivtv/Kconfig
-##
-CONFIG_VIDEO_IVTV=m
-
-##
-## file: drivers/media/video/pvrusb2/Kconfig
-##
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-
-##
-## file: drivers/media/video/saa7134/Kconfig
-##
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_DVB=m
-
-##
-## file: drivers/media/video/usbvision/Kconfig
-##
-CONFIG_VIDEO_USBVISION=m
-
-##
-## file: drivers/media/video/zc0301/Kconfig
-##
-CONFIG_USB_ZC0301=m
-
-##
-## file: drivers/media/video/zoran/Kconfig
-##
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
-
-##
-## file: drivers/message/fusion/Kconfig
-##
-CONFIG_FUSION=y
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION_FC=m
-CONFIG_FUSION_SAS=m
-CONFIG_FUSION_MAX_SGE=40
-CONFIG_FUSION_CTL=m
-CONFIG_FUSION_LAN=m
-
 ##
 ## file: drivers/message/i2o/Kconfig
 ##
@@ -1416,27 +1105,6 @@ CONFIG_DISPLAY_SUPPORT=m
 ##
 CONFIG_LOGO=y
 
-##
-## file: drivers/w1/Kconfig
-##
-CONFIG_W1=m
-CONFIG_W1_CON=y
-
-##
-## file: drivers/w1/masters/Kconfig
-##
-CONFIG_W1_MASTER_MATROX=m
-CONFIG_W1_MASTER_DS2490=m
-CONFIG_W1_MASTER_DS2482=m
-
-##
-## file: drivers/w1/slaves/Kconfig
-##
-CONFIG_W1_SLAVE_THERM=m
-CONFIG_W1_SLAVE_SMEM=m
-CONFIG_W1_SLAVE_DS2433=m
-# CONFIG_W1_SLAVE_DS2433_CRC is not set
-
 ##
 ## file: drivers/watchdog/Kconfig
 ##
@@ -1522,30 +1190,6 @@ CONFIG_AX25=m
 CONFIG_NETROM=m
 CONFIG_ROSE=m
 
-##
-## file: net/bridge/netfilter/Kconfig
-##
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_ULOG=m
-
 ##
 ## file: net/decnet/Kconfig
 ##
@@ -1604,12 +1248,6 @@ CONFIG_LAPB=m
 ##
 # CONFIG_NETLABEL is not set
 
-##
-## file: net/rfkill/Kconfig
-##
-CONFIG_RFKILL=m
-CONFIG_RFKILL_INPUT=m
-
 ##
 ## file: net/wanrouter/Kconfig
 ##
@@ -1618,7 +1256,6 @@ CONFIG_WAN_ROUTER=m
 ##
 ## file: net/wireless/Kconfig
 ##
-CONFIG_CFG80211=m
 CONFIG_WIRELESS_EXT=y
 
 ##
@@ -1703,11 +1340,3 @@ CONFIG_SND_YMFPCI=m
 ## file: sound/pci/hda/Kconfig
 ##
 CONFIG_SND_HDA_INTEL=m
-
-##
-## file: unknown
-##
-# CONFIG_MARKEINS is not set
-# CONFIG_MIPS_ATLAS is not set
-# CONFIG_MIPS_SEAD is not set
-