diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index b893e782e..ff195ee82 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -27,9 +27,9 @@ CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
 CONFIG_AMD_IOMMU=y
 # CONFIG_AMD_IOMMU_STATS is not set
 # CONFIG_MAXSMP is not set
-CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
 CONFIG_X86_MCE=y
 CONFIG_X86_MCE_INTEL=y
 CONFIG_I8K=m
@@ -119,7 +119,6 @@ CONFIG_KVM_AMD=m
 ##
 CONFIG_XEN=y
 CONFIG_XEN_MAX_DOMAIN_MEMORY=32
-CONFIG_XEN_SAVE_RESTORE=y
 # CONFIG_XEN_DEBUG_FS is not set
 
 ##
diff --git a/debian/config/arm/config.ixp4xx b/debian/config/arm/config.ixp4xx
index b5244aa77..9e1c4d10f 100644
--- a/debian/config/arm/config.ixp4xx
+++ b/debian/config/arm/config.ixp4xx
@@ -74,7 +74,6 @@ CONFIG_ARM_THUMB=y
 ## file: drivers/ata/Kconfig
 ##
 CONFIG_ATA=m
-# CONFIG_ATA_NONSTANDARD is not set
 # CONFIG_SATA_PMP is not set
 # CONFIG_SATA_AHCI is not set
 # CONFIG_SATA_SIL24 is not set
diff --git a/debian/config/arm/config.orion5x b/debian/config/arm/config.orion5x
index 2492a3393..42f0c7b16 100644
--- a/debian/config/arm/config.orion5x
+++ b/debian/config/arm/config.orion5x
@@ -146,7 +146,6 @@ CONFIG_BT_HCIVHCI=m
 ##
 CONFIG_DMADEVICES=y
 CONFIG_MV_XOR=y
-CONFIG_DMA_ENGINE=y
 # CONFIG_NET_DMA is not set
 
 ##
diff --git a/debian/config/arm/config.versatile b/debian/config/arm/config.versatile
index aeb4d5aa0..72c187b19 100644
--- a/debian/config/arm/config.versatile
+++ b/debian/config/arm/config.versatile
@@ -449,7 +449,6 @@ CONFIG_LOGO_LINUX_CLUT224=y
 ##
 ## file: kernel/time/Kconfig
 ##
-# CONFIG_TICK_ONESHOT is not set
 # CONFIG_NO_HZ is not set
 # CONFIG_HIGH_RES_TIMERS is not set
 
diff --git a/debian/config/config b/debian/config/config
index 2f45b9816..00e1cf2d4 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -643,7 +643,6 @@ CONFIG_USB_DABUSB=m
 ## file: drivers/media/common/tuners/Kconfig
 ##
 CONFIG_MEDIA_ATTACH=y
-# CONFIG_DVB_DYNAMIC_MINORS is not set
 # CONFIG_MEDIA_TUNER_CUSTOMIZE is not set
 CONFIG_MEDIA_TUNER_TDA827X=m
 CONFIG_MEDIA_TUNER_TEA5761=y
@@ -654,6 +653,7 @@ CONFIG_MEDIA_TUNER_QT1010=m
 ##
 ## file: drivers/media/dvb/Kconfig
 ##
+# CONFIG_DVB_DYNAMIC_MINORS is not set
 CONFIG_DVB_CAPTURE_DRIVERS=y
 
 ##
@@ -1489,7 +1489,6 @@ CONFIG_IPW2200_QOS=y
 ## file: drivers/net/wireless/iwlwifi/Kconfig
 ##
 CONFIG_IWLCORE=m
-CONFIG_IWLWIFI_LEDS=y
 CONFIG_IWLWIFI_RFKILL=y
 # CONFIG_IWLWIFI_DEBUG is not set
 CONFIG_IWLAGN=m
@@ -1869,16 +1868,16 @@ CONFIG_ET131X=m
 ##
 # CONFIG_VIDEO_GO7007 is not set
 
-##
-## file: drivers/staging/meilhaus/Kconfig
-##
-# CONFIG_MEILHAUS is not set
-
 ##
 ## file: drivers/staging/me4000/Kconfig
 ##
 # CONFIG_ME4000 is not set
 
+##
+## file: drivers/staging/meilhaus/Kconfig
+##
+# CONFIG_MEILHAUS is not set
+
 ##
 ## file: drivers/staging/mimio/Kconfig
 ##
@@ -2430,7 +2429,6 @@ CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
 CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=y
-# CONFIG_SUNRPC_REGISTER_V4 is not set
 
 ##
 ## file: fs/nfsd/Kconfig
@@ -2635,7 +2633,6 @@ CONFIG_CPUSETS=y
 CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_CPUACCT=y
 # CONFIG_RESOURCE_COUNTERS is not set
-# CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
 CONFIG_RELAY=y
 CONFIG_UTS_NS=y
@@ -2653,7 +2650,6 @@ CONFIG_KALLSYMS=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
-# CONFIG_COMPAT_BRK is not set
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
 CONFIG_SIGNALFD=y
@@ -2661,6 +2657,7 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
+# CONFIG_COMPAT_BRK is not set
 ## choice: Choose SLAB allocator
 CONFIG_SLAB=y
 # CONFIG_SLUB is not set
@@ -3235,6 +3232,7 @@ CONFIG_SCTP_HMAC_MD5=y
 ##
 ## file: net/sunrpc/Kconfig
 ##
+# CONFIG_SUNRPC_REGISTER_V4 is not set
 CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_RPCSEC_GSS_SPKM3=m
 
diff --git a/debian/config/i386/config b/debian/config/i386/config
index 53bffdd09..7f8472be3 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -29,11 +29,11 @@ CONFIG_KVM_GUEST=y
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_DEBUG is not set
 # CONFIG_MEMTEST is not set
-# CONFIG_MAXSMP is not set
-CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
 CONFIG_HPET_TIMER=y
+# CONFIG_MAXSMP is not set
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
 CONFIG_VM86=y
 CONFIG_TOSHIBA=m
 CONFIG_I8K=m
@@ -183,7 +183,6 @@ CONFIG_LGUEST_GUEST=y
 ##
 CONFIG_XEN=y
 CONFIG_XEN_MAX_DOMAIN_MEMORY=8
-CONFIG_XEN_SAVE_RESTORE=y
 # CONFIG_XEN_DEBUG_FS is not set
 
 ##
diff --git a/debian/config/m68k/config.atari b/debian/config/m68k/config.atari
index fbe580d47..4a2143f1b 100644
--- a/debian/config/m68k/config.atari
+++ b/debian/config/m68k/config.atari
@@ -14,7 +14,6 @@ CONFIG_M68020=y
 CONFIG_M68030=y
 CONFIG_M68040=y
 CONFIG_M68060=y
-CONFIG_MMU_MOTOROLA=y
 CONFIG_M68KFPU_EMU=y
 CONFIG_M68KFPU_EMU_EXTRAPREC=y
 # CONFIG_M68KFPU_EMU_ONLY is not set
@@ -53,7 +52,6 @@ CONFIG_BLK_DEV_IDECD=y
 CONFIG_IDE_GENERIC=y
 # CONFIG_IDE_ARM is not set
 CONFIG_BLK_DEV_FALCON_IDE=y
-# CONFIG_BLK_DEV_IDEDMA is not set
 
 ##
 ## file: drivers/input/joystick/Kconfig
@@ -121,8 +119,6 @@ CONFIG_ATARI_SCSI=y
 ## file: drivers/video/Kconfig
 ##
 CONFIG_FB=y
-# CONFIG_FB_CFB_IMAGEBLIT is not set
-# CONFIG_FB_MACMODES is not set
 # CONFIG_FB_MODE_HELPERS is not set
 # CONFIG_FB_TILEBLITTING is not set
 CONFIG_FB_ATARI=y
@@ -143,11 +139,6 @@ CONFIG_FONT_8x16=y
 ##
 # CONFIG_LOGO is not set
 
-##
-## file: fs/Kconfig
-##
-CONFIG_LOCKD=m
-
 ##
 ## file: fs/affs/Kconfig
 ##
@@ -209,7 +200,6 @@ CONFIG_IPX=m
 ##
 ## file: net/sunrpc/Kconfig
 ##
-CONFIG_SUNRPC=m
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 
 ##
@@ -221,7 +211,6 @@ CONFIG_SUNRPC=m
 ## file: sound/oss/dmasound/Kconfig
 ##
 CONFIG_DMASOUND_ATARI=m
-CONFIG_DMASOUND=m
 
 ##
 ## file: unknown
diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config
index 435a2d3a4..4fc03b2af 100644
--- a/debian/config/powerpc/config
+++ b/debian/config/powerpc/config
@@ -20,7 +20,6 @@ CONFIG_PCI=y
 ##
 CONFIG_XMON=y
 # CONFIG_XMON_DEFAULT is not set
-CONFIG_DEBUGGER=y
 # CONFIG_BDI_SWITCH is not set
 CONFIG_BOOTX_TEXT=y
 
@@ -28,15 +27,10 @@ CONFIG_BOOTX_TEXT=y
 ## file: arch/powerpc/kvm/Kconfig
 ##
 CONFIG_VIRTUALIZATION=y
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_NET=m
 
 ##
 ## file: arch/powerpc/platforms/Kconfig
 ##
-CONFIG_PPC_MULTIPLATFORM=y
 CONFIG_RTAS_PROC=y
 CONFIG_CPU_FREQ_PMAC=y
 CONFIG_PPC601_SYNC_FIX=y
@@ -120,6 +114,7 @@ CONFIG_BLK_DEV_RAM_SIZE=8192
 CONFIG_CDROM_PKTCDVD=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_VIRTIO_BLK=m
 
 ##
 ## file: drivers/bluetooth/Kconfig
@@ -491,8 +486,8 @@ CONFIG_I2O_SCSI=m
 CONFIG_I2O_PROC=m
 
 ##
-### file: drivers/misc/Kconfig
-###
+## file: drivers/misc/Kconfig
+##
 CONFIG_PHANTOM=m
 CONFIG_HP_ILO=m
 
@@ -555,6 +550,7 @@ CONFIG_HIPPI=y
 CONFIG_NET_FC=y
 CONFIG_NETCONSOLE=m
 CONFIG_NETPOLL_TRAP=y
+CONFIG_VIRTIO_NET=m
 
 ##
 ## file: drivers/net/arcnet/Kconfig
@@ -910,6 +906,12 @@ CONFIG_LOGO=y
 CONFIG_LOGO_LINUX_VGA16=y
 # CONFIG_LOGO_LINUX_CLUT224 is not set
 
+##
+## file: drivers/virtio/Kconfig
+##
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_BALLOON=m
+
 ##
 ## file: drivers/watchdog/Kconfig
 ##
diff --git a/debian/config/powerpc/config.powerpc b/debian/config/powerpc/config.powerpc
index 3473ed588..56d4c686e 100644
--- a/debian/config/powerpc/config.powerpc
+++ b/debian/config/powerpc/config.powerpc
@@ -47,9 +47,6 @@ CONFIG_ALTIVEC=y
 ## file: arch/powerpc/sysdev/bestcomm/Kconfig
 ##
 CONFIG_PPC_BESTCOMM=m
-CONFIG_PPC_BESTCOMM_ATA=m
-CONFIG_PPC_BESTCOMM_FEC=m
-CONFIG_PPC_BESTCOMM_GEN_BD=m
 
 ##
 ## file: drivers/ata/Kconfig
diff --git a/debian/config/powerpc/config.powerpc64 b/debian/config/powerpc/config.powerpc64
index dbf8b8cee..93697b652 100644
--- a/debian/config/powerpc/config.powerpc64
+++ b/debian/config/powerpc/config.powerpc64
@@ -15,7 +15,6 @@ CONFIG_KERNEL_START=0xc000000000000000
 ##
 ## file: arch/powerpc/Kconfig.debug
 ##
-# CONFIG_DEBUGGER is not set
 # CONFIG_IRQSTACKS is not set
 
 ##
diff --git a/debian/config/s390/config b/debian/config/s390/config
index eb20bad2e..f7aa9ffbf 100644
--- a/debian/config/s390/config
+++ b/debian/config/s390/config
@@ -1,7 +1,6 @@
 ##
 ## file: arch/s390/Kconfig
 ##
-CONFIG_VIRT_CPU_ACCOUNTING=y
 CONFIG_SMP=y
 CONFIG_NR_CPUS=32
 CONFIG_HOTPLUG_CPU=y
diff --git a/debian/config/s390/config.s390-tape b/debian/config/s390/config.s390-tape
index da7a9f065..2c77cc4c1 100644
--- a/debian/config/s390/config.s390-tape
+++ b/debian/config/s390/config.s390-tape
@@ -13,4 +13,3 @@ CONFIG_IPL_TAPE=y
 # CONFIG_IPL_VM is not set
 ## end choice
 
-