diff --git a/debian/config/alpha/config b/debian/config/alpha/config
index be993d6cf..13f81054e 100644
--- a/debian/config/alpha/config
+++ b/debian/config/alpha/config
@@ -230,6 +230,7 @@ CONFIG_SENSORS_F71805F=m
 CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
 CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_MAX1619=m
 CONFIG_SENSORS_LM63=m
 CONFIG_SENSORS_LM75=m
 CONFIG_SENSORS_LM77=m
@@ -240,7 +241,6 @@ CONFIG_SENSORS_LM85=m
 CONFIG_SENSORS_LM87=m
 CONFIG_SENSORS_LM90=m
 CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_MAX1619=m
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PCF8591=m
 CONFIG_SENSORS_SIS5595=m
@@ -353,8 +353,8 @@ CONFIG_ISDN_CAPI=m
 ## file: drivers/isdn/capi/Kconfig
 ##
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPIDRV=m
 
 ##
@@ -478,10 +478,6 @@ CONFIG_MTD_MTDRAM=m
 CONFIG_MTDRAM_TOTAL_SIZE=4096
 CONFIG_MTDRAM_ERASE_SIZE=128
 CONFIG_MTD_BLOCK2MTD=m
-CONFIG_MTD_DOCPROBE_ADVANCED=y
-CONFIG_MTD_DOCPROBE_ADDRESS=0x0000
-CONFIG_MTD_DOCPROBE_HIGH=y
-CONFIG_MTD_DOCPROBE_55AA=y
 
 ##
 ## file: drivers/mtd/maps/Kconfig
@@ -503,7 +499,6 @@ CONFIG_MTD_NAND=m
 ## file: drivers/net/Kconfig
 ##
 CONFIG_NET_FC=y
-CONFIG_NETPOLL_TRAP=y
 CONFIG_NET_SB1000=m
 
 ##
@@ -887,7 +882,19 @@ CONFIG_USB_SL811_HCD=m
 CONFIG_USB_SL811_CS=m
 
 ##
-## file: drivers/video/Kconfig
+## file: drivers/video/backlight/Kconfig
+##
+CONFIG_LCD_CLASS_DEVICE=m
+
+##
+## file: drivers/video/console/Kconfig
+##
+CONFIG_VGA_CONSOLE=y
+CONFIG_MDA_CONSOLE=m
+CONFIG_FRAMEBUFFER_CONSOLE=m
+
+##
+## file: drivers/video/fbdev/Kconfig
 ##
 CONFIG_FB=y
 CONFIG_FB_MODE_HELPERS=y
@@ -926,18 +933,6 @@ CONFIG_FB_VOODOO1=m
 CONFIG_FB_TRIDENT=m
 CONFIG_FB_VIRTUAL=m
 
-##
-## file: drivers/video/backlight/Kconfig
-##
-CONFIG_LCD_CLASS_DEVICE=m
-
-##
-## file: drivers/video/console/Kconfig
-##
-CONFIG_VGA_CONSOLE=y
-CONFIG_MDA_CONSOLE=m
-CONFIG_FRAMEBUFFER_CONSOLE=m
-
 ##
 ## file: drivers/watchdog/Kconfig
 ##
@@ -1106,3 +1101,12 @@ CONFIG_SND_YMFPCI=m
 ##
 CONFIG_SND_HDA_INTEL=m
 
+##
+## file: unknown
+##
+CONFIG_MTD_DOCPROBE_55AA=y
+CONFIG_MTD_DOCPROBE_ADDRESS=0x0000
+CONFIG_MTD_DOCPROBE_ADVANCED=y
+CONFIG_MTD_DOCPROBE_HIGH=y
+CONFIG_NETPOLL_TRAP=y
+
diff --git a/debian/config/arm64/config b/debian/config/arm64/config
index b2e2a53a8..66dc27095 100644
--- a/debian/config/arm64/config
+++ b/debian/config/arm64/config
@@ -3,9 +3,9 @@
 ##
 CONFIG_ARCH_VEXPRESS=y
 CONFIG_ARCH_XGENE=y
-CONFIG_COMPAT=y
 CONFIG_SMP=y
 CONFIG_XEN=y
+CONFIG_COMPAT=y
 
 ##
 ## file: drivers/input/misc/Kconfig
@@ -84,3 +84,4 @@ CONFIG_SERIAL_8250_DW=y
 ## file: drivers/virtio/Kconfig
 ##
 CONFIG_VIRTIO_MMIO=m
+
diff --git a/debian/config/armel/config-reduced b/debian/config/armel/config-reduced
index ab933d948..54aa8a6f4 100644
--- a/debian/config/armel/config-reduced
+++ b/debian/config/armel/config-reduced
@@ -17,14 +17,14 @@
 ## file: init/Kconfig
 ##
 # CONFIG_AUDITSYSCALL is not set
+#. Saves about 7K
+# CONFIG_MEMCG is not set
 # CONFIG_CHECKPOINT_RESTORE is not set
+#. Saves about 5K
+# CONFIG_USER_NS is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 #. Saves about 17K, and none of the quirks are likely to be needed
 # CONFIG_PCI_QUIRKS is not set
-#. Saves about 7K
-# CONFIG_MEMCG is not set
-#. Saves about 5K
-# CONFIG_USER_NS is not set
 
 ##
 ## file: kernel/trace/Kconfig
@@ -72,3 +72,4 @@ CONFIG_IPV6=m
 ## file: usr/Kconfig
 ##
 # CONFIG_RD_LZ4 is not set
+
diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood
index ced6c0756..b743bc7fe 100644
--- a/debian/config/armel/config.kirkwood
+++ b/debian/config/armel/config.kirkwood
@@ -28,44 +28,17 @@ CONFIG_FPE_NWFPE=y
 ## file: arch/arm/mach-kirkwood/Kconfig
 ##
 CONFIG_MACH_D2NET_V2=y
-CONFIG_MACH_DOCKSTAR=y
-CONFIG_MACH_ESATA_SHEEVAPLUG=y
-CONFIG_MACH_GURUPLUG=y
-CONFIG_MACH_INETSPACE_V2=y
-CONFIG_MACH_MV88F6281GTW_GE=y
 CONFIG_MACH_NET2BIG_V2=y
 CONFIG_MACH_NET5BIG_V2=y
-CONFIG_MACH_NETSPACE_MAX_V2=y
-CONFIG_MACH_NETSPACE_V2=y
 CONFIG_MACH_OPENRD_BASE=y
 CONFIG_MACH_OPENRD_CLIENT=y
 CONFIG_MACH_OPENRD_ULTIMATE=y
 CONFIG_MACH_RD88F6192_NAS=y
 CONFIG_MACH_RD88F6281=y
-CONFIG_MACH_SHEEVAPLUG=y
 CONFIG_MACH_T5325=y
 CONFIG_MACH_TS219=y
 CONFIG_MACH_TS41X=y
 CONFIG_ARCH_KIRKWOOD_DT=y
-CONFIG_MACH_DLINK_KIRKWOOD_DT=y
-CONFIG_MACH_DOCKSTAR_DT=y
-CONFIG_MACH_DREAMPLUG_DT=y
-CONFIG_MACH_GOFLEXNET_DT=y
-CONFIG_MACH_GURUPLUG_DT=y
-CONFIG_MACH_IB62X0_DT=y
-CONFIG_MACH_ICONNECT_DT=y
-CONFIG_MACH_INETSPACE_V2_DT=y
-CONFIG_MACH_IOMEGA_IX2_200_DT=y
-CONFIG_MACH_KM_KIRKWOOD_DT=y
-CONFIG_MACH_LSXL_DT=y
-CONFIG_MACH_MPLCEC4_DT=y
-CONFIG_MACH_NETSPACE_LITE_V2_DT=y
-CONFIG_MACH_NETSPACE_MAX_V2_DT=y
-CONFIG_MACH_NETSPACE_MINI_V2_DT=y
-CONFIG_MACH_NETSPACE_V2_DT=y
-CONFIG_MACH_OPENBLOCKS_A6_DT=y
-CONFIG_MACH_TOPKICK_DT=y
-CONFIG_MACH_TS219_DT=y
 
 ##
 ## file: arch/arm/mm/Kconfig
@@ -241,8 +214,8 @@ CONFIG_ISDN_CAPI=m
 ## file: drivers/isdn/capi/Kconfig
 ##
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPIDRV=m
 
 ##
@@ -367,7 +340,6 @@ CONFIG_MTD_PHYSMAP_OF=y
 CONFIG_MTD_NAND=y
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_CAFE is not set
-# CONFIG_MTD_ALAUDA is not set
 CONFIG_MTD_NAND_ORION=y
 
 ##
@@ -459,11 +431,6 @@ CONFIG_MVMDIO=m
 CONFIG_MWIFIEX=m
 CONFIG_MWIFIEX_SDIO=m
 
-##
-## file: drivers/of/Kconfig
-##
-CONFIG_PROC_DEVICETREE=y
-
 ##
 ## file: drivers/pci/host/Kconfig
 ##
@@ -603,17 +570,23 @@ CONFIG_USB_OHCI_HCD=m
 CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_SL811_HCD=m
 
-##
-## file: drivers/video/Kconfig
-##
-CONFIG_FB=m
-
 ##
 ## file: drivers/video/console/Kconfig
 ##
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_FRAMEBUFFER_CONSOLE=m
 
+##
+## file: drivers/video/fbdev/Kconfig
+##
+CONFIG_FB=m
+
+##
+## file: drivers/virtio/Kconfig
+##
+# CONFIG_VIRTIO_PCI is not set
+# CONFIG_VIRTIO_BALLOON is not set
+
 ##
 ## file: drivers/watchdog/Kconfig
 ##
@@ -684,15 +657,38 @@ CONFIG_SND_KIRKWOOD_SOC=m
 CONFIG_SND_KIRKWOOD_SOC_OPENRD=m
 CONFIG_SND_KIRKWOOD_SOC_T5325=m
 
-##
-## file: drivers/virtio/Kconfig
-##
-# CONFIG_VIRTIO_PCI is not set
-# CONFIG_VIRTIO_BALLOON is not set
-
 ##
 ## file: unknown
 ##
 #. This is replaced by CONFIG_MACH_DB88F628X_BP_DT but we don't use DT here yet
 CONFIG_MACH_DB88F6281_BP=y
+CONFIG_MACH_DLINK_KIRKWOOD_DT=y
+CONFIG_MACH_DOCKSTAR=y
+CONFIG_MACH_DOCKSTAR_DT=y
+CONFIG_MACH_DREAMPLUG_DT=y
+CONFIG_MACH_ESATA_SHEEVAPLUG=y
+CONFIG_MACH_GOFLEXNET_DT=y
+CONFIG_MACH_GURUPLUG=y
+CONFIG_MACH_GURUPLUG_DT=y
+CONFIG_MACH_IB62X0_DT=y
+CONFIG_MACH_ICONNECT_DT=y
+CONFIG_MACH_INETSPACE_V2=y
+CONFIG_MACH_INETSPACE_V2_DT=y
+CONFIG_MACH_IOMEGA_IX2_200_DT=y
+CONFIG_MACH_KM_KIRKWOOD_DT=y
+CONFIG_MACH_LSXL_DT=y
+CONFIG_MACH_MPLCEC4_DT=y
+CONFIG_MACH_MV88F6281GTW_GE=y
+CONFIG_MACH_NETSPACE_LITE_V2_DT=y
+CONFIG_MACH_NETSPACE_MAX_V2=y
+CONFIG_MACH_NETSPACE_MAX_V2_DT=y
+CONFIG_MACH_NETSPACE_MINI_V2_DT=y
+CONFIG_MACH_NETSPACE_V2=y
+CONFIG_MACH_NETSPACE_V2_DT=y
+CONFIG_MACH_OPENBLOCKS_A6_DT=y
+CONFIG_MACH_SHEEVAPLUG=y
+CONFIG_MACH_TOPKICK_DT=y
+CONFIG_MACH_TS219_DT=y
+# CONFIG_MTD_ALAUDA is not set
+CONFIG_PROC_DEVICETREE=y
 
diff --git a/debian/config/armel/config.mv78xx0 b/debian/config/armel/config.mv78xx0
index bdbac762f..45983fba1 100644
--- a/debian/config/armel/config.mv78xx0
+++ b/debian/config/armel/config.mv78xx0
@@ -203,8 +203,8 @@ CONFIG_ISDN_CAPI=m
 ## file: drivers/isdn/capi/Kconfig
 ##
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPIDRV=m
 
 ##
@@ -247,7 +247,6 @@ CONFIG_MTD=y
 # CONFIG_MTD_REDBOOT_PARTS is not set
 CONFIG_MTD_CMDLINE_PARTS=y
 # CONFIG_MTD_AFS_PARTS is not set
-CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y
 CONFIG_FTL=m
 CONFIG_NFTL=m
@@ -312,7 +311,6 @@ CONFIG_MTD_CFI_STAA=m
 CONFIG_MTD_NAND=y
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_CAFE is not set
-# CONFIG_MTD_ALAUDA is not set
 CONFIG_MTD_NAND_ORION=y
 
 ##
@@ -502,14 +500,20 @@ CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_SL811_HCD=m
 
 ##
-## file: drivers/video/Kconfig
+## file: drivers/video/console/Kconfig
+##
+# CONFIG_VGA_CONSOLE is not set
+
+##
+## file: drivers/video/fbdev/Kconfig
 ##
 CONFIG_FB=m
 
 ##
-## file: drivers/video/console/Kconfig
+## file: drivers/virtio/Kconfig
 ##
-# CONFIG_VGA_CONSOLE is not set
+# CONFIG_VIRTIO_PCI is not set
+# CONFIG_VIRTIO_BALLOON is not set
 
 ##
 ## file: drivers/watchdog/Kconfig
@@ -545,8 +549,8 @@ CONFIG_NETROM=m
 CONFIG_ROSE=m
 
 ##
-## file: drivers/virtio/Kconfig
+## file: unknown
 ##
-# CONFIG_VIRTIO_PCI is not set
-# CONFIG_VIRTIO_BALLOON is not set
+# CONFIG_MTD_ALAUDA is not set
+CONFIG_MTD_BLKDEVS=y
 
diff --git a/debian/config/armel/config.orion5x b/debian/config/armel/config.orion5x
index b290c3307..407c8b583 100644
--- a/debian/config/armel/config.orion5x
+++ b/debian/config/armel/config.orion5x
@@ -217,8 +217,8 @@ CONFIG_ISDN_CAPI=m
 ## file: drivers/isdn/capi/Kconfig
 ##
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPIDRV=m
 
 ##
@@ -261,7 +261,6 @@ CONFIG_MTD=y
 # CONFIG_MTD_REDBOOT_PARTS is not set
 CONFIG_MTD_CMDLINE_PARTS=y
 # CONFIG_MTD_AFS_PARTS is not set
-CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y
 CONFIG_FTL=m
 CONFIG_NFTL=m
@@ -326,7 +325,6 @@ CONFIG_MTD_CFI_STAA=m
 CONFIG_MTD_NAND=y
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_CAFE is not set
-# CONFIG_MTD_ALAUDA is not set
 CONFIG_MTD_NAND_ORION=y
 
 ##
@@ -518,14 +516,20 @@ CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_SL811_HCD=m
 
 ##
-## file: drivers/video/Kconfig
+## file: drivers/video/console/Kconfig
+##
+# CONFIG_VGA_CONSOLE is not set
+
+##
+## file: drivers/video/fbdev/Kconfig
 ##
 CONFIG_FB=m
 
 ##
-## file: drivers/video/console/Kconfig
+## file: drivers/virtio/Kconfig
 ##
-# CONFIG_VGA_CONSOLE is not set
+# CONFIG_VIRTIO_PCI is not set
+# CONFIG_VIRTIO_BALLOON is not set
 
 ##
 ## file: drivers/watchdog/Kconfig
@@ -560,15 +564,11 @@ CONFIG_AX25=m
 CONFIG_NETROM=m
 CONFIG_ROSE=m
 
-##
-## file: drivers/virtio/Kconfig
-##
-# CONFIG_VIRTIO_PCI is not set
-# CONFIG_VIRTIO_BALLOON is not set
-
 ##
 ## file: unknown
 ##
 #. This is replaced by CONFIG_MACH_EDMINI_V2_DT but we don't use DT here yet
 CONFIG_MACH_EDMINI_V2=y
+# CONFIG_MTD_ALAUDA is not set
+CONFIG_MTD_BLKDEVS=y
 
diff --git a/debian/config/armel/config.versatile b/debian/config/armel/config.versatile
index ea21209f1..845238f71 100644
--- a/debian/config/armel/config.versatile
+++ b/debian/config/armel/config.versatile
@@ -167,7 +167,6 @@ CONFIG_SERIO_LIBPS2=y
 ##
 # CONFIG_NET_FC is not set
 CONFIG_IFB=m
-# CONFIG_NETPOLL_TRAP is not set
 
 ##
 ## file: drivers/net/arcnet/Kconfig
@@ -368,9 +367,19 @@ CONFIG_USB_UHCI_HCD=m
 # CONFIG_USB_R8A66597_HCD is not set
 
 ##
-## file: drivers/video/Kconfig
+## file: drivers/video/backlight/Kconfig
+##
+CONFIG_BACKLIGHT_CLASS_DEVICE=m
+
+##
+## file: drivers/video/console/Kconfig
+##
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+
+##
+## file: drivers/video/fbdev/Kconfig
 ##
-CONFIG_VIDEO_OUTPUT_CONTROL=m
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_MODE_HELPERS=y
@@ -401,17 +410,6 @@ CONFIG_FB_PM3=m
 CONFIG_FB_SM501=m
 CONFIG_FB_VIRTUAL=m
 
-##
-## file: drivers/video/backlight/Kconfig
-##
-CONFIG_BACKLIGHT_CLASS_DEVICE=m
-
-##
-## file: drivers/video/console/Kconfig
-##
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-
 ##
 ## file: drivers/virtio/Kconfig
 ##
@@ -459,3 +457,9 @@ CONFIG_IPX_INTERN=y
 ##
 # CONFIG_LAPB is not set
 
+##
+## file: unknown
+##
+# CONFIG_NETPOLL_TRAP is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+
diff --git a/debian/config/armhf/config.armmp b/debian/config/armhf/config.armmp
index d1b540142..4b018daaf 100644
--- a/debian/config/armhf/config.armmp
+++ b/debian/config/armhf/config.armmp
@@ -6,9 +6,12 @@ CONFIG_ARCH_MULTIPLATFORM=y
 ## end choice
 # CONFIG_ARCH_MULTI_V6 is not set
 CONFIG_ARCH_MULTI_V7=y
+CONFIG_ARCH_VIRT=y
+CONFIG_PCI=y
 CONFIG_SMP=y
 CONFIG_SMP_ON_UP=y
 CONFIG_HIGHMEM=y
+CONFIG_XEN=y
 CONFIG_ARM_APPENDED_DTB=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y
 ## choice: Kernel command line type
@@ -17,10 +20,6 @@ CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y
 ## end choice
 CONFIG_NEON=y
 
-CONFIG_PCI=y
-
-CONFIG_XEN=y
-
 ##
 ## file: arch/arm/Kconfig.debug
 ##
@@ -36,7 +35,6 @@ CONFIG_ARCH_HIGHBANK=y
 ## file: arch/arm/mach-imx/Kconfig
 ##
 CONFIG_ARCH_MXC=y
-CONFIG_MXC_IRQ_PRIOR=y
 CONFIG_MACH_IMX51_DT=y
 CONFIG_MACH_MX51_BABBAGE=y
 CONFIG_MACH_EUKREA_CPUIMX51SD=y
@@ -82,11 +80,6 @@ CONFIG_ARCH_VEXPRESS=y
 CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y
 CONFIG_ARCH_VEXPRESS_CA9X4=y
 
-##
-## file: arch/arm/mach-virt/Kconfig
-##
-CONFIG_ARCH_VIRT=y
-
 ##
 ## file: arch/arm/mach-vt8500/Kconfig
 ##
@@ -170,22 +163,22 @@ CONFIG_CRYPTO_DEV_OMAP_AES=m
 CONFIG_DMADEVICES=y
 CONFIG_AMBA_PL08X=y
 CONFIG_MV_XOR=y
+CONFIG_TI_EDMA=y
 CONFIG_PL330_DMA=y
 CONFIG_IMX_SDMA=y
 CONFIG_IMX_DMA=y
 CONFIG_MXS_DMA=y
 CONFIG_DMA_OMAP=y
 CONFIG_TI_CPPI41=m
-CONFIG_TI_EDMA=y
 
 ##
 ## file: drivers/gpio/Kconfig
 ##
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_DA9052=m
+CONFIG_GPIO_GENERIC_PLATFORM=m
 CONFIG_GPIO_TWL4030=y
 CONFIG_GPIO_TWL6040=y
-CONFIG_GPIO_GENERIC_PLATFORM=m
 
 ##
 ## file: drivers/gpu/drm/Kconfig
@@ -261,8 +254,8 @@ CONFIG_SERIO_AMBAKMI=m
 ## file: drivers/input/touchscreen/Kconfig
 ##
 CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_TSC2005=m
 CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
+CONFIG_TOUCHSCREEN_TSC2005=m
 
 ##
 ## file: drivers/iommu/Kconfig
@@ -306,9 +299,13 @@ CONFIG_VIDEO_OMAP2_VOUT=m
 ## file: drivers/media/radio/Kconfig
 ##
 CONFIG_RADIO_ADAPTERS=y
-CONFIG_I2C_SI4713=m
 CONFIG_RADIO_SI4713=m
 
+##
+## file: drivers/media/radio/si4713/Kconfig
+##
+CONFIG_I2C_SI4713=m
+
 ##
 ## file: drivers/media/radio/wl128x/Kconfig
 ##
@@ -356,7 +353,6 @@ CONFIG_MMC_OMAP_HS=m
 CONFIG_MMC_MVSDIO=m
 CONFIG_MMC_SPI=m
 CONFIG_MMC_WMT=m
-CONFIG_MMC_SUNXI=m
 
 ##
 ## file: drivers/mtd/Kconfig
@@ -467,8 +463,8 @@ CONFIG_8139TOO_8129=y
 ## file: drivers/net/ethernet/smsc/Kconfig
 ##
 CONFIG_NET_VENDOR_SMSC=y
-CONFIG_EPIC100=m
 CONFIG_SMC91X=m
+CONFIG_EPIC100=m
 CONFIG_SMC911X=m
 CONFIG_SMSC911X=m
 
@@ -534,6 +530,8 @@ CONFIG_WLCORE_SDIO=m
 ##
 ## file: drivers/phy/Kconfig
 ##
+CONFIG_OMAP_USB2=m
+CONFIG_TWL4030_USB=m
 CONFIG_PHY_SUN4I_USB=m
 
 ##
@@ -574,8 +572,8 @@ CONFIG_PWM_VT8500=m
 ## file: drivers/regulator/Kconfig
 ##
 CONFIG_REGULATOR=y
-CONFIG_REGULATOR_DA9052=m
 CONFIG_REGULATOR_ANATOP=m
+CONFIG_REGULATOR_DA9052=m
 CONFIG_REGULATOR_MC13783=m
 CONFIG_REGULATOR_MC13892=m
 CONFIG_REGULATOR_TWL4030=y
@@ -623,9 +621,9 @@ CONFIG_LIS3L02DQ=m
 CONFIG_DRM_IMX=m
 CONFIG_DRM_IMX_FB_HELPER=m
 CONFIG_DRM_IMX_LDB=m
-CONFIG_DRM_IMX_HDMI=m
 CONFIG_DRM_IMX_IPUV3_CORE=m
 CONFIG_DRM_IMX_IPUV3=m
+CONFIG_DRM_IMX_HDMI=m
 
 ##
 ## file: drivers/staging/tidspbridge/Kconfig
@@ -650,12 +648,12 @@ CONFIG_SERIAL_IMX=y
 CONFIG_SERIAL_IMX_CONSOLE=y
 CONFIG_SERIAL_VT8500=y
 CONFIG_SERIAL_VT8500_CONSOLE=y
+CONFIG_SERIAL_OF_PLATFORM=y
+CONFIG_SERIAL_OMAP=y
+CONFIG_SERIAL_OMAP_CONSOLE=y
 CONFIG_SERIAL_ARC=y
 CONFIG_SERIAL_ARC_CONSOLE=y
 CONFIG_SERIAL_ARC_NR_PORTS=1
-CONFIG_SERIAL_OMAP=y
-CONFIG_SERIAL_OMAP_CONSOLE=y
-CONFIG_SERIAL_OF_PLATFORM=y
 
 ##
 ## file: drivers/tty/serial/8250/Kconfig
@@ -703,7 +701,7 @@ CONFIG_USB_EHCI_HCD_OMAP=y
 CONFIG_USB_EHCI_HCD_PLATFORM=m
 CONFIG_USB_OHCI_HCD=m
 CONFIG_USB_OHCI_HCD_OMAP3=y
-CONFIG_USB_OHCI_HCD_PLATFORM=m 
+CONFIG_USB_OHCI_HCD_PLATFORM=m
 
 ##
 ## file: drivers/usb/musb/Kconfig
@@ -721,23 +719,9 @@ CONFIG_MUSB_PIO_ONLY=y
 ## file: drivers/usb/phy/Kconfig
 ##
 CONFIG_NOP_USB_XCEIV=y
-CONFIG_OMAP_CONTROL_USB=m
-CONFIG_OMAP_USB2=m
-CONFIG_OMAP_USB3=m
-CONFIG_TWL4030_USB=m
+CONFIG_AM335X_PHY_USB=m
 CONFIG_TWL6030_USB=m
 CONFIG_USB_MXS_PHY=m
-CONFIG_AM335X_CONTROL_USB=m
-CONFIG_AM335X_PHY_USB=m
-
-##
-## file: drivers/video/Kconfig
-##
-CONFIG_VIDEO_OUTPUT_CONTROL=y
-CONFIG_FB=y
-CONFIG_FB_ARMCLCD=y
-CONFIG_FB_VT8500=y
-CONFIG_FB_WM8505=y
 
 ##
 ## file: drivers/video/console/Kconfig
@@ -745,13 +729,15 @@ CONFIG_FB_WM8505=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 
 ##
-## file: drivers/video/omap2/displays/Kconfig
+## file: drivers/video/fbdev/Kconfig
 ##
-CONFIG_PANEL_GENERIC_DPI=y
-CONFIG_PANEL_ACX565AKM=y
+CONFIG_FB=y
+CONFIG_FB_ARMCLCD=y
+CONFIG_FB_VT8500=y
+CONFIG_FB_WM8505=y
 
 ##
-## file: drivers/video/omap2/dss/Kconfig
+## file: drivers/video/fbdev/omap2/dss/Kconfig
 ##
 CONFIG_OMAP2_DSS=m
 CONFIG_OMAP2_DSS_VENC=y
@@ -759,7 +745,7 @@ CONFIG_OMAP4_DSS_HDMI=y
 CONFIG_OMAP2_DSS_SDI=y
 
 ##
-## file: drivers/video/omap2/omapfb/Kconfig
+## file: drivers/video/fbdev/omap2/omapfb/Kconfig
 ##
 CONFIG_FB_OMAP2=m
 
@@ -801,8 +787,8 @@ CONFIG_SND_SOC=m
 CONFIG_SND_IMX_SOC=m
 CONFIG_SND_SOC_EUKREA_TLV320=m
 CONFIG_SND_SOC_IMX_SGTL5000=m
-CONFIG_SND_SOC_IMX_MC13783=m
 CONFIG_SND_SOC_IMX_SPDIF=m
+CONFIG_SND_SOC_IMX_MC13783=m
 
 ##
 ## file: sound/soc/omap/Kconfig
@@ -815,3 +801,15 @@ CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m
 CONFIG_SND_OMAP_SOC_OMAP_HDMI=m
 CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
 
+##
+## file: unknown
+##
+CONFIG_AM335X_CONTROL_USB=m
+CONFIG_MMC_SUNXI=m
+CONFIG_MXC_IRQ_PRIOR=y
+CONFIG_OMAP_CONTROL_USB=m
+CONFIG_OMAP_USB3=m
+CONFIG_PANEL_ACX565AKM=y
+CONFIG_PANEL_GENERIC_DPI=y
+CONFIG_VIDEO_OUTPUT_CONTROL=y
+
diff --git a/debian/config/armhf/config.lpae b/debian/config/armhf/config.lpae
index ab96c014e..d5045f1ee 100644
--- a/debian/config/armhf/config.lpae
+++ b/debian/config/armhf/config.lpae
@@ -3,18 +3,19 @@
 ##
 CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
 
-##
-## file: arch/arm/mm/Kconfig
-##
-CONFIG_ARM_LPAE=y
-
 ##
 ## file: arch/arm/kvm/Kconfig
 ##
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=y
 
+##
+## file: arch/arm/mm/Kconfig
+##
+CONFIG_ARM_LPAE=y
+
 ##
 ## file: drivers/iommu/Kconfig
 ##
 CONFIG_ARM_SMMU=y
+
diff --git a/debian/config/config b/debian/config/config
index 6575c14e7..d5f870ae8 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -3,7 +3,6 @@
 ##
 CONFIG_KPROBES=y
 CONFIG_JUMP_LABEL=y
-CONFIG_UPROBES=y
 
 ##
 ## file: block/Kconfig
@@ -207,8 +206,8 @@ CONFIG_PATA_TOSHIBA=m
 # CONFIG_PATA_MPIIX is not set
 # CONFIG_PATA_NS87410 is not set
 # CONFIG_PATA_OPTI is not set
-# CONFIG_PATA_PLATFORM is not set
 # CONFIG_PATA_PCMCIA is not set
+# CONFIG_PATA_PLATFORM is not set
 # CONFIG_PATA_QDI is not set
 # CONFIG_PATA_RZ1000 is not set
 # CONFIG_PATA_WINBOND_VLB is not set
@@ -452,7 +451,6 @@ CONFIG_EFI_VARS_PSTORE=m
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_ADP5588 is not set
 # CONFIG_GPIO_CS5535 is not set
-# CONFIG_GPIO_LANGWELL is not set
 # CONFIG_GPIO_AMD8111 is not set
 # CONFIG_GPIO_PCH is not set
 # CONFIG_GPIO_ML_IOH is not set
@@ -625,7 +623,6 @@ CONFIG_SENSORS_ABITUGURU3=m
 # CONFIG_SENSORS_AD7314 is not set
 CONFIG_SENSORS_AD7414=m
 CONFIG_SENSORS_AD7418=m
-CONFIG_SENSORS_ADCXX=m
 CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM9240=m
 # CONFIG_SENSORS_ADT7310 is not set
@@ -634,32 +631,28 @@ CONFIG_SENSORS_ADT7462=m
 CONFIG_SENSORS_ADT7470=m
 CONFIG_SENSORS_ADT7475=m
 CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_APPLESMC=m
 CONFIG_SENSORS_ATXP1=m
 CONFIG_SENSORS_DS620=m
 CONFIG_SENSORS_I5K_AMB=m
 CONFIG_SENSORS_F71882FG=m
 CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_MC13783_ADC=m
 CONFIG_SENSORS_FSCHMD=m
 CONFIG_SENSORS_G760A=m
 # CONFIG_SENSORS_GPIO_FAN is not set
 # CONFIG_SENSORS_HIH6130 is not set
-# CONFIG_SENSORS_HTU21 is not set
-CONFIG_SENSORS_CORETEMP=m
 CONFIG_SENSORS_IBMAEM=m
 CONFIG_SENSORS_IBMPEX=m
 # CONFIG_SENSORS_IIO_HWMON is not set
+CONFIG_SENSORS_CORETEMP=m
 # CONFIG_SENSORS_IT87 is not set
 CONFIG_SENSORS_JC42=m
 CONFIG_SENSORS_LINEAGE=m
-CONFIG_SENSORS_LM70=m
-CONFIG_SENSORS_LM73=m
-CONFIG_SENSORS_LM93=m
 CONFIG_SENSORS_LTC4151=m
 CONFIG_SENSORS_LTC4215=m
 CONFIG_SENSORS_LTC4245=m
 CONFIG_SENSORS_LTC4261=m
-CONFIG_SENSORS_LM95241=m
-CONFIG_SENSORS_LM95245=m
 CONFIG_SENSORS_MAX1111=m
 CONFIG_SENSORS_MAX16065=m
 CONFIG_SENSORS_MAX1668=m
@@ -667,19 +660,26 @@ CONFIG_SENSORS_MAX1668=m
 CONFIG_SENSORS_MAX6639=m
 CONFIG_SENSORS_MAX6642=m
 CONFIG_SENSORS_MAX6650=m
+# CONFIG_SENSORS_HTU21 is not set
 # CONFIG_SENSORS_MCP3021 is not set
-CONFIG_SENSORS_NCT6775=m
-CONFIG_SENSORS_NTC_THERMISTOR=m
+CONFIG_SENSORS_ADCXX=m
+CONFIG_SENSORS_LM70=m
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_LM95245=m
 CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_NTC_THERMISTOR=m
+CONFIG_SENSORS_NCT6775=m
 # CONFIG_SENSORS_SHT15 is not set
 CONFIG_SENSORS_SHT21=m
-CONFIG_SENSORS_SMM665=m
 CONFIG_SENSORS_DME1737=m
 CONFIG_SENSORS_EMC1403=m
 CONFIG_SENSORS_EMC2103=m
 CONFIG_SENSORS_EMC6W201=m
 CONFIG_SENSORS_SMSC47M192=m
 CONFIG_SENSORS_SCH5627=m
+CONFIG_SENSORS_SMM665=m
 CONFIG_SENSORS_ADS1015=m
 CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADS7871=m
@@ -702,8 +702,6 @@ CONFIG_SENSORS_W83L786NG=m
 CONFIG_SENSORS_W83627EHF=m
 CONFIG_SENSORS_WM831X=m
 CONFIG_SENSORS_WM8350=m
-CONFIG_SENSORS_APPLESMC=m
-CONFIG_SENSORS_MC13783_ADC=m
 CONFIG_SENSORS_ATK0110=m
 
 ##
@@ -776,17 +774,17 @@ CONFIG_IIO_BUFFER=y
 ## file: drivers/iio/accel/Kconfig
 ##
 CONFIG_HID_SENSOR_ACCEL_3D=m
-# CONFIG_KXSD9 is not set
 # CONFIG_IIO_ST_ACCEL_3AXIS is not set
+# CONFIG_KXSD9 is not set
 
 ##
 ## file: drivers/iio/adc/Kconfig
 ##
 # CONFIG_AD7266 is not set
 # CONFIG_AD7298 is not set
+# CONFIG_AD7476 is not set
 # CONFIG_AD7791 is not set
 # CONFIG_AD7793 is not set
-# CONFIG_AD7476 is not set
 # CONFIG_AD7887 is not set
 # CONFIG_MAX1363 is not set
 # CONFIG_TI_ADC081C is not set
@@ -803,14 +801,14 @@ CONFIG_HID_SENSOR_ACCEL_3D=m
 # CONFIG_AD5360 is not set
 # CONFIG_AD5380 is not set
 # CONFIG_AD5421 is not set
-# CONFIG_AD5624R_SPI is not set
 # CONFIG_AD5446 is not set
 # CONFIG_AD5449 is not set
 # CONFIG_AD5504 is not set
+# CONFIG_AD5624R_SPI is not set
+# CONFIG_AD5686 is not set
 # CONFIG_AD5755 is not set
 # CONFIG_AD5764 is not set
 # CONFIG_AD5791 is not set
-# CONFIG_AD5686 is not set
 # CONFIG_MAX517 is not set
 # CONFIG_MCP4725 is not set
 
@@ -854,11 +852,11 @@ CONFIG_HID_SENSOR_GYRO_3D=m
 # CONFIG_CM32181 is not set
 # CONFIG_CM36651 is not set
 # CONFIG_GP2AP020A00F is not set
+CONFIG_HID_SENSOR_ALS=m
 # CONFIG_TCS3472 is not set
 # CONFIG_SENSORS_TSL2563 is not set
 # CONFIG_TSL4531 is not set
 # CONFIG_VCNL4000 is not set
-CONFIG_HID_SENSOR_ALS=m
 
 ##
 ## file: drivers/iio/magnetometer/Kconfig
@@ -1148,8 +1146,8 @@ CONFIG_TOUCHSCREEN_PENMOUNT=m
 # CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set
 CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
-# CONFIG_TOUCHSCREEN_PIXCIR is not set
 CONFIG_TOUCHSCREEN_UCB1400=m
+# CONFIG_TOUCHSCREEN_PIXCIR is not set
 CONFIG_TOUCHSCREEN_WM97XX=m
 CONFIG_TOUCHSCREEN_WM9705=y
 CONFIG_TOUCHSCREEN_WM9712=y
@@ -1173,7 +1171,6 @@ CONFIG_TOUCHSCREEN_USB_E2I=y
 CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
 CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
 CONFIG_TOUCHSCREEN_USB_NEXIO=y
-CONFIG_TOUCHSCREEN_USB_E2I=y
 CONFIG_TOUCHSCREEN_TOUCHIT213=m
 # CONFIG_TOUCHSCREEN_TSC2005 is not set
 CONFIG_TOUCHSCREEN_TSC2007=m
@@ -1286,13 +1283,12 @@ CONFIG_BLK_DEV_DM=m
 CONFIG_DM_CRYPT=m
 CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_THIN_PROVISIONING=m
-# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
 CONFIG_DM_CACHE=m
 CONFIG_DM_CACHE_MQ=y
 CONFIG_DM_CACHE_CLEANER=y
 CONFIG_DM_MIRROR=m
-CONFIG_DM_RAID=m
 CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_RAID=m
 CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_QL=m
@@ -1308,9 +1304,13 @@ CONFIG_DM_SWITCH=m
 ##
 CONFIG_BCACHE=m
 # CONFIG_BCACHE_DEBUG is not set
-# CONFIG_BCACHE_EDEBUG is not set
 # CONFIG_BCACHE_CLOSURES_DEBUG is not set
 
+##
+## file: drivers/md/persistent-data/Kconfig
+##
+# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
+
 ##
 ## file: drivers/media/Kconfig
 ##
@@ -1613,11 +1613,10 @@ CONFIG_VIDEO_CAFE_CCIC=m
 ##
 CONFIG_RADIO_ADAPTERS=y
 CONFIG_RADIO_SI470X=y
+# CONFIG_RADIO_SI4713 is not set
 CONFIG_USB_MR800=m
 CONFIG_RADIO_SHARK=m
 CONFIG_RADIO_SHARK2=m
-# CONFIG_I2C_SI4713 is not set
-# CONFIG_RADIO_SI4713 is not set
 CONFIG_USB_KEENE=m
 CONFIG_USB_RAREMONO=m
 CONFIG_USB_MA901=m
@@ -1632,6 +1631,11 @@ CONFIG_USB_MA901=m
 CONFIG_USB_SI470X=m
 # CONFIG_I2C_SI470X is not set
 
+##
+## file: drivers/media/radio/si4713/Kconfig
+##
+# CONFIG_I2C_SI4713 is not set
+
 ##
 ## file: drivers/media/radio/wl128x/Kconfig
 ##
@@ -1751,7 +1755,6 @@ CONFIG_DVB_USB_AZ6007=m
 CONFIG_DVB_USB_CE6230=m
 CONFIG_DVB_USB_EC168=m
 CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_IT913X=m
 CONFIG_DVB_USB_LME2510=m
 CONFIG_DVB_USB_MXL111SF=m
 CONFIG_DVB_USB_RTL28XXU=m
@@ -1859,16 +1862,10 @@ CONFIG_USB_S2255=m
 ##
 CONFIG_SMS_USB_DRV=m
 
-##
-## file: drivers/media/usb/sn9c102/Kconfig
-##
-CONFIG_USB_SN9C102=m
-
 ##
 ## file: drivers/media/usb/stk1160/Kconfig
 ##
 CONFIG_VIDEO_STK1160_COMMON=m
-CONFIG_VIDEO_STK1160=m
 CONFIG_VIDEO_STK1160_AC97=y
 
 ##
@@ -2064,6 +2061,11 @@ CONFIG_C2PORT_DURAMAR_2150=m
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 
+##
+## file: drivers/misc/echo/Kconfig
+##
+# CONFIG_ECHO is not set
+
 ##
 ## file: drivers/misc/eeprom/Kconfig
 ##
@@ -2092,11 +2094,6 @@ CONFIG_MMC_BLOCK_BOUNCE=y
 CONFIG_SDIO_UART=m
 # CONFIG_MMC_TEST is not set
 
-##
-## file: drivers/mmc/core/Kconfig
-##
-# CONFIG_MMC_UNSAFE_RESUME is not set
-
 ##
 ## file: drivers/mmc/host/Kconfig
 ##
@@ -2119,7 +2116,6 @@ CONFIG_MMC_REALTEK_PCI=m
 ##
 # CONFIG_MTD_TESTS is not set
 CONFIG_MTD_AR7_PARTS=m
-CONFIG_MTD_BLKDEVS=m
 CONFIG_RFD_FTL=m
 CONFIG_SSFDC=m
 # CONFIG_SM_FTL is not set
@@ -2133,7 +2129,6 @@ CONFIG_MTD_DATAFLASH=m
 # CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
 # CONFIG_MTD_DATAFLASH_OTP is not set
 CONFIG_MTD_M25P80=m
-CONFIG_M25PXX_USE_FAST_READ=y
 CONFIG_MTD_SST25L=m
 # CONFIG_MTD_DOCG3 is not set
 
@@ -2167,7 +2162,6 @@ CONFIG_MTD_NAND_CAFE=m
 CONFIG_MTD_NAND_CS553X=m
 CONFIG_MTD_NAND_NANDSIM=m
 # CONFIG_MTD_NAND_PLATFORM is not set
-CONFIG_MTD_ALAUDA=m
 
 ##
 ## file: drivers/mtd/onenand/Kconfig
@@ -2454,11 +2448,6 @@ CONFIG_MLX4_EN=m
 CONFIG_MLX4_EN_DCB=y
 CONFIG_MLX4_DEBUG=y
 
-##
-## file: drivers/net/ethernet/mellanox/mlx5/core/Kconfig
-##
-CONFIG_MLX5_DEBUG=y
-
 ##
 ## file: drivers/net/ethernet/micrel/Kconfig
 ##
@@ -2842,7 +2831,6 @@ CONFIG_ATH9K_PCI=y
 # CONFIG_ATH9K_AHB is not set
 # CONFIG_ATH9K_DEBUGFS is not set
 # CONFIG_ATH9K_WOW is not set
-# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set
 CONFIG_ATH9K_RFKILL=y
 CONFIG_ATH9K_HTC=m
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
@@ -2855,6 +2843,11 @@ CONFIG_CARL9170_LEDS=y
 # CONFIG_CARL9170_DEBUGFS is not set
 # CONFIG_CARL9170_HWRNG is not set
 
+##
+## file: drivers/net/wireless/ath/wcn36xx/Kconfig
+##
+# CONFIG_WCN36XX is not set
+
 ##
 ## file: drivers/net/wireless/ath/wil6210/Kconfig
 ##
@@ -2862,11 +2855,6 @@ CONFIG_WIL6210=m
 CONFIG_WIL6210_ISR_COR=y
 CONFIG_WIL6210_TRACING=y
 
-##
-## file: drivers/net/wireless/ath/wcn36xx/Kconfig
-##
-# CONFIG_WCN36XX is not set
-
 ##
 ## file: drivers/net/wireless/b43/Kconfig
 ##
@@ -2939,7 +2927,6 @@ CONFIG_IWLDVM=m
 CONFIG_IWLMVM=m
 # CONFIG_IWLWIFI_DEBUG is not set
 # CONFIG_IWLWIFI_DEVICE_TRACING is not set
-CONFIG_IWLWIFI_P2P=y
 
 ##
 ## file: drivers/net/wireless/libertas/Kconfig
@@ -3029,11 +3016,6 @@ CONFIG_NFC_PN533=m
 CONFIG_NFC_SIM=m
 CONFIG_NFC_PORT100=m
 
-##
-## file: drivers/of/Kconfig
-##
-CONFIG_PROC_DEVICETREE=y
-
 ##
 ## file: drivers/parport/Kconfig
 ##
@@ -3097,6 +3079,8 @@ CONFIG_YENTA_TOSHIBA=y
 ##
 # CONFIG_GENERIC_PHY is not set
 # CONFIG_PHY_EXYNOS_MIPI_VIDEO is not set
+# CONFIG_OMAP_USB2 is not set
+# CONFIG_TWL4030_USB is not set
 # CONFIG_PHY_EXYNOS_DP_VIDEO is not set
 # CONFIG_BCM_KONA_USB2_PHY is not set
 
@@ -3290,7 +3274,6 @@ CONFIG_SCSI_AHA152X=m
 CONFIG_SCSI_AHA1542=m
 CONFIG_SCSI_AHA1740=m
 CONFIG_SCSI_AACRAID=m
-# CONFIG_SCSI_AIC7XXX_OLD is not set
 CONFIG_SCSI_MVUMI=m
 CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_HPTIOP=m
@@ -3457,8 +3440,8 @@ CONFIG_SPI=y
 CONFIG_SPI_BITBANG=m
 CONFIG_SPI_BUTTERFLY=m
 # CONFIG_SPI_GPIO is not set
-# CONFIG_SPI_FSL_DSPI is not set
 CONFIG_SPI_LM70_LLP=m
+# CONFIG_SPI_FSL_DSPI is not set
 # CONFIG_SPI_OC_TINY is not set
 # CONFIG_SPI_PXA2XX is not set
 # CONFIG_SPI_SC18IS602 is not set
@@ -3487,16 +3470,6 @@ CONFIG_STAGING=y
 ##
 # CONFIG_ANDROID is not set
 
-##
-## file: drivers/staging/asus_oled/Kconfig
-##
-# CONFIG_ASUS_OLED is not set
-
-##
-## file: drivers/staging/media/bcm2048/Kconfig
-##
-# CONFIG_I2C_BCM2048 is not set
-
 ##
 ## file: drivers/staging/comedi/Kconfig
 ##
@@ -3507,11 +3480,6 @@ CONFIG_STAGING=y
 ##
 # CONFIG_CRYSTALHD is not set
 
-##
-## file: drivers/staging/echo/Kconfig
-##
-# CONFIG_ECHO is not set
-
 ##
 ## file: drivers/staging/et131x/Kconfig
 ##
@@ -3537,11 +3505,21 @@ CONFIG_STAGING=y
 ##
 # CONFIG_STAGING_MEDIA is not set
 
+##
+## file: drivers/staging/media/bcm2048/Kconfig
+##
+# CONFIG_I2C_BCM2048 is not set
+
 ##
 ## file: drivers/staging/media/omap24xx/Kconfig
 ##
 # CONFIG_VIDEO_TCM825X is not set
 
+##
+## file: drivers/staging/media/sn9c102/Kconfig
+##
+CONFIG_USB_SN9C102=m
+
 ##
 ## file: drivers/staging/panel/Kconfig
 ##
@@ -3552,11 +3530,6 @@ CONFIG_STAGING=y
 ##
 # CONFIG_IDE_PHISON is not set
 
-##
-## file: drivers/staging/rtl8187se/Kconfig
-##
-# CONFIG_R8187SE is not set
-
 ##
 ## file: drivers/staging/rtl8188eu/Kconfig
 ##
@@ -3617,11 +3590,6 @@ CONFIG_STAGING=y
 ##
 # CONFIG_SLICOSS is not set
 
-##
-## file: drivers/staging/sm7xxfb/Kconfig
-##
-# CONFIG_FB_SM7XX is not set
-
 ##
 ## file: drivers/staging/speakup/Kconfig
 ##
@@ -3768,7 +3736,6 @@ CONFIG_SERIAL_8250_HUB6=m
 ##
 CONFIG_UIO=m
 CONFIG_UIO_CIF=m
-# CONFIG_UIO_PDRV is not set
 # CONFIG_UIO_PDRV_GENIRQ is not set
 # CONFIG_UIO_DMEM_GENIRQ is not set
 CONFIG_UIO_AEC=m
@@ -3826,7 +3793,6 @@ CONFIG_USB_DYNAMIC_MINORS=y
 ##
 # CONFIG_USB_C67X00_HCD is not set
 CONFIG_USB_XHCI_HCD=m
-# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 # CONFIG_USB_EHCI_HCD_PLATFORM is not set
@@ -3898,13 +3864,9 @@ CONFIG_USB_MON=y
 # CONFIG_ISP1301_OMAP is not set
 # CONFIG_MV_U3D_PHY is not set
 # CONFIG_NOP_USB_XCEIV is not set
-# CONFIG_OMAP_CONTROL_USB is not set
-# CONFIG_OMAP_USB2 is not set
-# CONFIG_OMAP_USB3 is not set
 # CONFIG_AM335X_PHY_USB is not set
 # CONFIG_SAMSUNG_USB2PHY is not set
 # CONFIG_SAMSUNG_USB3PHY is not set
-# CONFIG_TWL4030_USB is not set
 # CONFIG_TWL6030_USB is not set
 # CONFIG_USB_GPIO_VBUS is not set
 # CONFIG_USB_ISP1301 is not set
@@ -3934,7 +3896,6 @@ CONFIG_USB_SERIAL_CP210X=m
 CONFIG_USB_SERIAL_CYPRESS_M8=m
 CONFIG_USB_SERIAL_EMPEG=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_FUNSOFT=m
 CONFIG_USB_SERIAL_VISOR=m
 CONFIG_USB_SERIAL_IPAQ=m
 CONFIG_USB_SERIAL_IR=m
@@ -3953,7 +3914,6 @@ CONFIG_USB_SERIAL_METRO=m
 CONFIG_USB_SERIAL_MOS7720=m
 CONFIG_USB_SERIAL_MOS7715_PARPORT=y
 CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_MOTOROLA=m
 CONFIG_USB_SERIAL_MXUPORT=m
 CONFIG_USB_SERIAL_NAVMAN=m
 CONFIG_USB_SERIAL_PL2303=m
@@ -3961,10 +3921,8 @@ CONFIG_USB_SERIAL_OTI6858=m
 CONFIG_USB_SERIAL_QCAUX=m
 CONFIG_USB_SERIAL_QUALCOMM=m
 CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_HP4X=m
 CONFIG_USB_SERIAL_SAFE=m
 # CONFIG_USB_SERIAL_SAFE_PADDED is not set
-CONFIG_USB_SERIAL_SIEMENS_MPI=m
 CONFIG_USB_SERIAL_SIERRAWIRELESS=m
 CONFIG_USB_SERIAL_SYMBOL=m
 CONFIG_USB_SERIAL_TI=m
@@ -3973,15 +3931,11 @@ CONFIG_USB_SERIAL_XIRCOM=m
 CONFIG_USB_SERIAL_OPTION=m
 CONFIG_USB_SERIAL_OMNINET=m
 CONFIG_USB_SERIAL_OPTICON=m
-CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
 CONFIG_USB_SERIAL_XSENS_MT=m
-CONFIG_USB_SERIAL_ZIO=m
 CONFIG_USB_SERIAL_WISHBONE=m
 CONFIG_USB_SERIAL_ZTE=m
 CONFIG_USB_SERIAL_SSU100=m
 CONFIG_USB_SERIAL_QT2=m
-CONFIG_USB_SERIAL_FLASHLOADER=m
-CONFIG_USB_SERIAL_SUUNTO=m
 CONFIG_USB_SERIAL_DEBUG=m
 
 ##
@@ -4025,7 +3979,25 @@ CONFIG_VHOST_NET=m
 CONFIG_VHOST_SCSI=m
 
 ##
-## file: drivers/video/Kconfig
+## file: drivers/video/backlight/Kconfig
+##
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+# CONFIG_LCD_CLASS_DEVICE is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+# CONFIG_BACKLIGHT_GENERIC is not set
+CONFIG_BACKLIGHT_APPLE=m
+# CONFIG_BACKLIGHT_SAHARA is not set
+CONFIG_BACKLIGHT_WM831X=m
+
+##
+## file: drivers/video/console/Kconfig
+##
+# CONFIG_VGACON_SOFT_SCROLLBACK is not set
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+
+##
+## file: drivers/video/fbdev/Kconfig
 ##
 CONFIG_FIRMWARE_EDID=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
@@ -4064,25 +4036,7 @@ CONFIG_FB_MB862XX_I2C=y
 # CONFIG_FB_AUO_K190X is not set
 
 ##
-## file: drivers/video/backlight/Kconfig
-##
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-# CONFIG_LCD_CLASS_DEVICE is not set
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-# CONFIG_BACKLIGHT_GENERIC is not set
-CONFIG_BACKLIGHT_APPLE=m
-# CONFIG_BACKLIGHT_SAHARA is not set
-CONFIG_BACKLIGHT_WM831X=m
-
-##
-## file: drivers/video/console/Kconfig
-##
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-
-##
-## file: drivers/video/exynos/Kconfig
+## file: drivers/video/fbdev/exynos/Kconfig
 ##
 # CONFIG_EXYNOS_VIDEO is not set
 
@@ -4732,7 +4686,6 @@ CONFIG_POSIX_MQUEUE=y
 CONFIG_FHANDLE=y
 CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y
-# CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_TASKSTATS=y
@@ -4815,8 +4768,8 @@ CONFIG_SLAB=y
 # CONFIG_SLOB is not set
 ## end choice
 # CONFIG_MMAP_ALLOW_UNINITIALIZED is not set
-CONFIG_PROFILING=y
 # CONFIG_SYSTEM_TRUSTED_KEYRING is not set
+CONFIG_PROFILING=y
 CONFIG_MODULES=y
 CONFIG_MODULE_FORCE_LOAD=y
 CONFIG_MODULE_UNLOAD=y
@@ -4968,7 +4921,6 @@ CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_WRITECOUNT is not set
 # CONFIG_DEBUG_LIST is not set
 # CONFIG_DEBUG_SG is not set
 # CONFIG_DEBUG_NOTIFIERS is not set
@@ -4995,7 +4947,6 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=21
 # CONFIG_ASYNC_RAID6_TEST is not set
 # CONFIG_TEST_STRING_HELPERS is not set
 # CONFIG_TEST_KSTRTOX is not set
-# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
 # CONFIG_DMA_API_DEBUG is not set
 # CONFIG_TEST_MODULE is not set
 # CONFIG_TEST_USER_COPY is not set
@@ -5018,7 +4969,6 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=21
 ##
 ## file: lib/xz/Kconfig
 ##
-# CONFIG_XZ_DEC_TEST is not set
 #. These are enabled again by arch config, matching the defaults
 # CONFIG_XZ_DEC_X86 is not set
 # CONFIG_XZ_DEC_POWERPC is not set
@@ -5026,6 +4976,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=21
 # CONFIG_XZ_DEC_ARM is not set
 # CONFIG_XZ_DEC_ARMTHUMB is not set
 # CONFIG_XZ_DEC_SPARC is not set
+# CONFIG_XZ_DEC_TEST is not set
 
 ##
 ## file: mm/Kconfig
@@ -5245,7 +5196,6 @@ CONFIG_IP_MROUTE=y
 CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
 CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
-# CONFIG_ARPD is not set
 CONFIG_SYN_COOKIES=y
 CONFIG_NET_IPVTI=m
 CONFIG_INET_AH=m
@@ -5312,7 +5262,6 @@ CONFIG_IP_NF_ARP_MANGLE=m
 ## file: net/ipv6/Kconfig
 ##
 CONFIG_IPV6=y
-CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_IPV6_OPTIMISTIC_DAD=y
@@ -5983,3 +5932,42 @@ CONFIG_RD_LZMA=y
 CONFIG_RD_XZ=y
 CONFIG_RD_LZO=y
 CONFIG_RD_LZ4=y
+
+##
+## file: unknown
+##
+# CONFIG_ARPD is not set
+# CONFIG_ASUS_OLED is not set
+# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set
+# CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set
+# CONFIG_BCACHE_EDEBUG is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+CONFIG_DVB_USB_IT913X=m
+# CONFIG_FB_SM7XX is not set
+# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
+# CONFIG_GPIO_LANGWELL is not set
+CONFIG_IPV6_PRIVACY=y
+CONFIG_IWLWIFI_P2P=y
+CONFIG_M25PXX_USE_FAST_READ=y
+CONFIG_MLX5_DEBUG=y
+# CONFIG_MMC_UNSAFE_RESUME is not set
+CONFIG_MTD_ALAUDA=m
+CONFIG_MTD_BLKDEVS=m
+# CONFIG_OMAP_CONTROL_USB is not set
+# CONFIG_OMAP_USB3 is not set
+CONFIG_PROC_DEVICETREE=y
+# CONFIG_R8187SE is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_UIO_PDRV is not set
+CONFIG_UPROBES=y
+CONFIG_USB_SERIAL_FLASHLOADER=m
+CONFIG_USB_SERIAL_FUNSOFT=m
+CONFIG_USB_SERIAL_HP4X=m
+CONFIG_USB_SERIAL_MOTOROLA=m
+CONFIG_USB_SERIAL_SIEMENS_MPI=m
+CONFIG_USB_SERIAL_SUUNTO=m
+CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
+CONFIG_USB_SERIAL_ZIO=m
+# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
+CONFIG_VIDEO_STK1160=m
+
diff --git a/debian/config/hppa/config b/debian/config/hppa/config
index cadbad078..2cc1060fd 100644
--- a/debian/config/hppa/config
+++ b/debian/config/hppa/config
@@ -21,7 +21,6 @@ CONFIG_PARISC_PAGE_SIZE_4KB=y
 ## file: arch/parisc/Kconfig.debug
 ##
 # CONFIG_DEBUG_RODATA is not set
-CONFIG_DEBUG_STACKOVERFLOW=y
 
 ##
 ## file: block/partitions/Kconfig
@@ -188,7 +187,6 @@ CONFIG_I2O_PROC=m
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_NET_FC is not set
-# CONFIG_NETPOLL_TRAP is not set
 
 ##
 ## file: drivers/net/appletalk/Kconfig
@@ -531,7 +529,15 @@ CONFIG_USB_OHCI_HCD=m
 # CONFIG_USB_SL811_HCD is not set
 
 ##
-## file: drivers/video/Kconfig
+## file: drivers/video/console/Kconfig
+##
+CONFIG_DUMMY_CONSOLE_COLUMNS=160
+CONFIG_DUMMY_CONSOLE_ROWS=64
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_STI_CONSOLE=y
+
+##
+## file: drivers/video/fbdev/Kconfig
 ##
 CONFIG_FB=y
 CONFIG_FB_MODE_HELPERS=y
@@ -560,14 +566,6 @@ CONFIG_FB_STI=y
 # CONFIG_FB_PM3 is not set
 # CONFIG_FB_VIRTUAL is not set
 
-##
-## file: drivers/video/console/Kconfig
-##
-CONFIG_DUMMY_CONSOLE_COLUMNS=160
-CONFIG_DUMMY_CONSOLE_ROWS=64
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_STI_CONSOLE=y
-
 ##
 ## file: drivers/w1/Kconfig
 ##
@@ -581,6 +579,7 @@ CONFIG_ROOT_NFS=y
 ##
 ## file: lib/Kconfig.debug
 ##
+CONFIG_DEBUG_STACKOVERFLOW=y
 # CONFIG_LOCKUP_DETECTOR is not set
 
 ##
@@ -722,3 +721,8 @@ CONFIG_SND_HARMONY=m
 ##
 # CONFIG_SND_HDA_INTEL is not set
 
+##
+## file: unknown
+##
+# CONFIG_NETPOLL_TRAP is not set
+
diff --git a/debian/config/hppa/config.parisc64-smp b/debian/config/hppa/config.parisc64-smp
index 69aa506eb..ff1b0e912 100644
--- a/debian/config/hppa/config.parisc64-smp
+++ b/debian/config/hppa/config.parisc64-smp
@@ -21,15 +21,6 @@ CONFIG_PATA_SIL680=m
 CONFIG_AGP=y
 CONFIG_AGP_PARISC=y
 
-##
-## file: drivers/gpu/drm/Kconfig
-##
-#. for ATI FireGL DRM in C8000 workstation
-CONFIG_DRM=y
-CONFIG_DRM_KMS_HELPER=y
-CONFIG_DRM_TTM=m
-CONFIG_DRM_RADEON=m
-
 ##
 ## file: drivers/char/ipmi/Kconfig
 ##
@@ -39,6 +30,13 @@ CONFIG_IPMI_SI=m
 CONFIG_IPMI_WATCHDOG=m
 CONFIG_IPMI_POWEROFF=m
 
+##
+## file: drivers/gpu/drm/Kconfig
+##
+#. for ATI FireGL DRM in C8000 workstation
+CONFIG_DRM=y
+CONFIG_DRM_RADEON=m
+
 ##
 ## file: mm/Kconfig
 ##
@@ -48,3 +46,9 @@ CONFIG_DISCONTIGMEM_MANUAL=y
 # CONFIG_SPARSEMEM_MANUAL is not set
 ## end choice
 
+##
+## file: unknown
+##
+CONFIG_DRM_KMS_HELPER=y
+CONFIG_DRM_TTM=m
+
diff --git a/debian/config/i386/config.486 b/debian/config/i386/config.486
index 5732fb515..4b62dfcb1 100644
--- a/debian/config/i386/config.486
+++ b/debian/config/i386/config.486
@@ -107,7 +107,7 @@ CONFIG_SCSI_SIM710=m
 CONFIG_MOXA_INTELLIO=m
 
 ##
-## file: drivers/video/geode/Kconfig
+## file: drivers/video/fbdev/geode/Kconfig
 ##
 CONFIG_FB_GEODE=y
 CONFIG_FB_GEODE_LX=m
diff --git a/debian/config/ia64/config b/debian/config/ia64/config
index f664afe87..8808e3a2e 100644
--- a/debian/config/ia64/config
+++ b/debian/config/ia64/config
@@ -201,6 +201,7 @@ CONFIG_SENSORS_F71805F=m
 CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
 CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_MAX1619=m
 CONFIG_SENSORS_LM63=m
 CONFIG_SENSORS_LM75=m
 CONFIG_SENSORS_LM77=m
@@ -211,7 +212,6 @@ CONFIG_SENSORS_LM85=m
 CONFIG_SENSORS_LM87=m
 CONFIG_SENSORS_LM90=m
 CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_MAX1619=m
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PCF8591=m
 CONFIG_SENSORS_SIS5595=m
@@ -350,8 +350,8 @@ CONFIG_ISDN_CAPI=m
 ## file: drivers/isdn/capi/Kconfig
 ##
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
-# CONFIG_ISDN_CAPI_MIDDLEWARE is not set
 CONFIG_ISDN_CAPI_CAPI20=m
+# CONFIG_ISDN_CAPI_MIDDLEWARE is not set
 
 ##
 ## file: drivers/isdn/hardware/avm/Kconfig
@@ -722,7 +722,13 @@ CONFIG_USB_SL811_HCD=m
 CONFIG_USB_SL811_CS=m
 
 ##
-## file: drivers/video/Kconfig
+## file: drivers/video/console/Kconfig
+##
+CONFIG_VGA_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+
+##
+## file: drivers/video/fbdev/Kconfig
 ##
 CONFIG_FB=y
 CONFIG_FB_MODE_HELPERS=y
@@ -760,12 +766,6 @@ CONFIG_FB_VOODOO1=m
 CONFIG_FB_TRIDENT=m
 # CONFIG_FB_VIRTUAL is not set
 
-##
-## file: drivers/video/console/Kconfig
-##
-CONFIG_VGA_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-
 ##
 ## file: fs/pstore/Kconfig
 ##
diff --git a/debian/config/kernelarch-mips/config.4kc-malta b/debian/config/kernelarch-mips/config.4kc-malta
index f7ec3ae35..4c70dd366 100644
--- a/debian/config/kernelarch-mips/config.4kc-malta
+++ b/debian/config/kernelarch-mips/config.4kc-malta
@@ -95,6 +95,7 @@ CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1026=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_MAX1619=m
 CONFIG_SENSORS_LM63=m
 CONFIG_SENSORS_LM75=m
 CONFIG_SENSORS_LM77=m
@@ -105,7 +106,6 @@ CONFIG_SENSORS_LM85=m
 CONFIG_SENSORS_LM87=m
 CONFIG_SENSORS_LM90=m
 CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_MAX1619=m
 CONFIG_SENSORS_PCF8591=m
 
 ##
@@ -139,7 +139,6 @@ CONFIG_INPUT_JOYSTICK=y
 CONFIG_KEYBOARD_NEWTON=m
 CONFIG_KEYBOARD_SUNKBD=m
 
-
 ##
 ## file: drivers/input/mouse/Kconfig
 ##
@@ -432,7 +431,12 @@ CONFIG_USB_UHCI_HCD=y
 CONFIG_USB_SL811_HCD=m
 
 ##
-## file: drivers/video/Kconfig
+## file: drivers/video/console/Kconfig
+##
+CONFIG_FRAMEBUFFER_CONSOLE=y
+
+##
+## file: drivers/video/fbdev/Kconfig
 ##
 CONFIG_FB=y
 CONFIG_FB_MODE_HELPERS=y
@@ -467,11 +471,6 @@ CONFIG_FB_VOODOO1=m
 CONFIG_FB_TRIDENT=m
 CONFIG_FB_VIRTUAL=m
 
-##
-## file: drivers/video/console/Kconfig
-##
-CONFIG_FRAMEBUFFER_CONSOLE=y
-
 ##
 ## file: drivers/watchdog/Kconfig
 ##
@@ -585,3 +584,4 @@ CONFIG_SND_VIA82XX=m
 CONFIG_SND_VIA82XX_MODEM=m
 CONFIG_SND_VX222=m
 CONFIG_SND_YMFPCI=m
+
diff --git a/debian/config/kernelarch-mips/config.5kc-malta b/debian/config/kernelarch-mips/config.5kc-malta
index 2a459981e..116a71223 100644
--- a/debian/config/kernelarch-mips/config.5kc-malta
+++ b/debian/config/kernelarch-mips/config.5kc-malta
@@ -98,6 +98,7 @@ CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1026=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_MAX1619=m
 CONFIG_SENSORS_LM63=m
 CONFIG_SENSORS_LM75=m
 CONFIG_SENSORS_LM77=m
@@ -108,7 +109,6 @@ CONFIG_SENSORS_LM85=m
 CONFIG_SENSORS_LM87=m
 CONFIG_SENSORS_LM90=m
 CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_MAX1619=m
 CONFIG_SENSORS_PCF8591=m
 
 ##
@@ -434,7 +434,12 @@ CONFIG_USB_UHCI_HCD=y
 CONFIG_USB_SL811_HCD=m
 
 ##
-## file: drivers/video/Kconfig
+## file: drivers/video/console/Kconfig
+##
+CONFIG_FRAMEBUFFER_CONSOLE=y
+
+##
+## file: drivers/video/fbdev/Kconfig
 ##
 CONFIG_FB=y
 CONFIG_FB_MODE_HELPERS=y
@@ -469,11 +474,6 @@ CONFIG_FB_VOODOO1=m
 CONFIG_FB_TRIDENT=m
 CONFIG_FB_VIRTUAL=m
 
-##
-## file: drivers/video/console/Kconfig
-##
-CONFIG_FRAMEBUFFER_CONSOLE=y
-
 ##
 ## file: drivers/watchdog/Kconfig
 ##
@@ -587,3 +587,4 @@ CONFIG_SND_VIA82XX=m
 CONFIG_SND_VIA82XX_MODEM=m
 CONFIG_SND_VX222=m
 CONFIG_SND_YMFPCI=m
+
diff --git a/debian/config/kernelarch-mips/config.loongson-2e b/debian/config/kernelarch-mips/config.loongson-2e
index 2d436950f..b77a96b64 100644
--- a/debian/config/kernelarch-mips/config.loongson-2e
+++ b/debian/config/kernelarch-mips/config.loongson-2e
@@ -13,13 +13,6 @@ CONFIG_MIPS32_COMPAT=y
 CONFIG_MIPS32_O32=y
 CONFIG_MIPS32_N32=y
 
-##
-## file: arch/mips/loongson/Kconfig
-##
-## choice: Machine Type
-CONFIG_LEMOTE_MACH2E=y
-## end choice
-
 ##
 ## file: drivers/ata/Kconfig
 ##
@@ -73,11 +66,6 @@ CONFIG_RTC_DRV_CMOS=y
 ##
 # CONFIG_SCSI_LPFC is not set
 
-##
-## file: drivers/staging/sm7xxfb/Kconfig
-##
-CONFIG_FB_SM7XX=y
-
 ##
 ## file: drivers/tty/Kconfig
 ##
@@ -110,13 +98,6 @@ CONFIG_USB_SL811_HCD=m
 ##
 CONFIG_USB_MON=y
 
-##
-## file: drivers/video/Kconfig
-##
-CONFIG_VIDEO_OUTPUT_CONTROL=y
-CONFIG_FB=y
-CONFIG_FB_RADEON=y
-
 ##
 ## file: drivers/video/backlight/Kconfig
 ##
@@ -129,3 +110,16 @@ CONFIG_BACKLIGHT_GENERIC=m
 ##
 CONFIG_FRAMEBUFFER_CONSOLE=y
 
+##
+## file: drivers/video/fbdev/Kconfig
+##
+CONFIG_FB=y
+CONFIG_FB_RADEON=y
+
+##
+## file: unknown
+##
+CONFIG_FB_SM7XX=y
+CONFIG_LEMOTE_MACH2E=y
+CONFIG_VIDEO_OUTPUT_CONTROL=y
+
diff --git a/debian/config/kernelarch-mips/config.loongson-2f b/debian/config/kernelarch-mips/config.loongson-2f
index 58e3353d5..fbf47d637 100644
--- a/debian/config/kernelarch-mips/config.loongson-2f
+++ b/debian/config/kernelarch-mips/config.loongson-2f
@@ -75,11 +75,6 @@ CONFIG_RTC_DRV_CMOS=y
 ##
 # CONFIG_SCSI_LPFC is not set
 
-##
-## file: drivers/staging/sm7xxfb/Kconfig
-##
-CONFIG_FB_SM7XX=y
-
 ##
 ## file: drivers/tty/Kconfig
 ##
@@ -112,15 +107,6 @@ CONFIG_USB_SL811_HCD=m
 ##
 CONFIG_USB_MON=y
 
-##
-## file: drivers/video/Kconfig
-##
-CONFIG_VIDEO_OUTPUT_CONTROL=y
-CONFIG_FB=y
-CONFIG_FB_SIS=y
-CONFIG_FB_SIS_300=y
-CONFIG_FB_SIS_315=y
-
 ##
 ## file: drivers/video/backlight/Kconfig
 ##
@@ -133,3 +119,17 @@ CONFIG_BACKLIGHT_GENERIC=m
 ##
 CONFIG_FRAMEBUFFER_CONSOLE=y
 
+##
+## file: drivers/video/fbdev/Kconfig
+##
+CONFIG_FB=y
+CONFIG_FB_SIS=y
+CONFIG_FB_SIS_300=y
+CONFIG_FB_SIS_315=y
+
+##
+## file: unknown
+##
+CONFIG_FB_SM7XX=y
+CONFIG_VIDEO_OUTPUT_CONTROL=y
+
diff --git a/debian/config/kernelarch-mips/config.loongson-3 b/debian/config/kernelarch-mips/config.loongson-3
index ce63a5d88..0052bc081 100644
--- a/debian/config/kernelarch-mips/config.loongson-3
+++ b/debian/config/kernelarch-mips/config.loongson-3
@@ -92,18 +92,17 @@ CONFIG_USB_OHCI_HCD=m
 CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_SL811_HCD=m
 
-##
-## file: drivers/video/Kconfig
-##
-CONFIG_VIDEO_OUTPUT_CONTROL=y
-CONFIG_FB=y
-CONFIG_FB_RADEON=y
-
 ##
 ## file: drivers/video/console/Kconfig
 ##
 CONFIG_FRAMEBUFFER_CONSOLE=y
 
+##
+## file: drivers/video/fbdev/Kconfig
+##
+CONFIG_FB=y
+CONFIG_FB_RADEON=y
+
 ##
 ## file: kernel/Kconfig.preempt
 ##
@@ -122,3 +121,9 @@ CONFIG_PREEMPT=y
 ## file: sound/pci/hda/Kconfig
 ##
 CONFIG_SND_HDA_INTEL=m
+
+##
+## file: unknown
+##
+CONFIG_VIDEO_OUTPUT_CONTROL=y
+
diff --git a/debian/config/kernelarch-mips/config.r4k-ip22 b/debian/config/kernelarch-mips/config.r4k-ip22
index a663570ad..bb5b14d1b 100644
--- a/debian/config/kernelarch-mips/config.r4k-ip22
+++ b/debian/config/kernelarch-mips/config.r4k-ip22
@@ -34,11 +34,6 @@ CONFIG_SGI_PARTITION=y
 ##
 # CONFIG_ATA is not set
 
-##
-## file: net/bluetooth/Kconfig
-##
-# CONFIG_BT is not set
-
 ##
 ## file: drivers/char/Kconfig
 ##
@@ -54,8 +49,8 @@ CONFIG_EISA_NAMES=y
 ##
 # CONFIG_SENSORS_ADM9240 is not set
 # CONFIG_SENSORS_ATXP1 is not set
-# CONFIG_SENSORS_W83627EHF is not set
 # CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83627EHF is not set
 
 ##
 ## file: drivers/i2c/Kconfig
@@ -139,17 +134,17 @@ CONFIG_SGIWD93_SCSI=y
 CONFIG_SERIAL_IP22_ZILOG=y
 CONFIG_SERIAL_IP22_ZILOG_CONSOLE=y
 
-##
-## file: drivers/video/Kconfig
-##
-CONFIG_FB=y
-
 ##
 ## file: drivers/video/console/Kconfig
 ##
 CONFIG_SGI_NEWPORT_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 
+##
+## file: drivers/video/fbdev/Kconfig
+##
+CONFIG_FB=y
+
 ##
 ## file: drivers/w1/Kconfig
 ##
@@ -160,8 +155,14 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 ##
 CONFIG_INDYDOG=m
 
+##
+## file: net/bluetooth/Kconfig
+##
+# CONFIG_BT is not set
+
 ##
 ## file: sound/mips/Kconfig
 ##
 CONFIG_SND_MIPS=y
 CONFIG_SND_SGI_HAL2=m
+
diff --git a/debian/config/kernelarch-mips/config.r5k-ip32 b/debian/config/kernelarch-mips/config.r5k-ip32
index 39aff7226..e5a575016 100644
--- a/debian/config/kernelarch-mips/config.r5k-ip32
+++ b/debian/config/kernelarch-mips/config.r5k-ip32
@@ -241,17 +241,17 @@ CONFIG_USB_OHCI_HCD=m
 CONFIG_USB_UHCI_HCD=m
 
 ##
-## file: drivers/video/Kconfig
+## file: drivers/video/console/Kconfig
+##
+CONFIG_FRAMEBUFFER_CONSOLE=y
+
+##
+## file: drivers/video/fbdev/Kconfig
 ##
 CONFIG_FB=y
 CONFIG_FB_GBE=y
 # CONFIG_FB_3DFX is not set
 
-##
-## file: drivers/video/console/Kconfig
-##
-CONFIG_FRAMEBUFFER_CONSOLE=y
-
 ##
 ## file: drivers/w1/Kconfig
 ##
@@ -277,3 +277,4 @@ CONFIG_SND_SGI_O2=m
 # CONFIG_SND_HDSPM is not set
 CONFIG_SND_KORG1212=m
 # CONFIG_SND_PCXHR is not set
+
diff --git a/debian/config/kernelarch-mips/config.sb1-bcm91250a b/debian/config/kernelarch-mips/config.sb1-bcm91250a
index b0e193a5d..f6bf07445 100644
--- a/debian/config/kernelarch-mips/config.sb1-bcm91250a
+++ b/debian/config/kernelarch-mips/config.sb1-bcm91250a
@@ -62,7 +62,6 @@ CONFIG_PATA_PLATFORM=y
 ## file: drivers/char/Kconfig
 ##
 CONFIG_PRINTER=m
-## CONFIG_PPDEV is not set
 CONFIG_RTC=m
 
 ##
@@ -236,7 +235,13 @@ CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_SL811_HCD=m
 
 ##
-## file: drivers/video/Kconfig
+## file: drivers/video/console/Kconfig
+##
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+
+##
+## file: drivers/video/fbdev/Kconfig
 ##
 CONFIG_FB=y
 CONFIG_FB_MODE_HELPERS=y
@@ -260,12 +265,6 @@ CONFIG_FB_KYRO=m
 CONFIG_FB_VOODOO1=m
 CONFIG_FB_TRIDENT=m
 
-##
-## file: drivers/video/console/Kconfig
-##
-CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-
 ##
 ## file: drivers/w1/Kconfig
 ##
@@ -283,3 +282,4 @@ CONFIG_ROOT_NFS=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
+
diff --git a/debian/config/kernelarch-powerpc/config b/debian/config/kernelarch-powerpc/config
index 89b83f185..fa465a384 100644
--- a/debian/config/kernelarch-powerpc/config
+++ b/debian/config/kernelarch-powerpc/config
@@ -236,6 +236,7 @@ CONFIG_SENSORS_F71805F=m
 CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
 CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_MAX1619=m
 CONFIG_SENSORS_LM63=m
 CONFIG_SENSORS_LM75=m
 CONFIG_SENSORS_LM77=m
@@ -246,7 +247,6 @@ CONFIG_SENSORS_LM85=m
 CONFIG_SENSORS_LM87=m
 CONFIG_SENSORS_LM90=m
 CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_MAX1619=m
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PCF8591=m
 CONFIG_SENSORS_SIS5595=m
@@ -357,8 +357,8 @@ CONFIG_ISDN_CAPI=m
 ## file: drivers/isdn/capi/Kconfig
 ##
 # CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
 
 ##
 ## file: drivers/isdn/hardware/avm/Kconfig
@@ -450,7 +450,6 @@ CONFIG_MMC_BLOCK=m
 ## file: drivers/net/Kconfig
 ##
 CONFIG_NET_FC=y
-CONFIG_NETPOLL_TRAP=y
 
 ##
 ## file: drivers/net/arcnet/Kconfig
@@ -676,11 +675,6 @@ CONFIG_TMD_HERMES=m
 CONFIG_PCI_HERMES=m
 CONFIG_PCMCIA_HERMES=m
 
-##
-## file: drivers/of/Kconfig
-##
-CONFIG_PROC_DEVICETREE=y
-
 ##
 ## file: drivers/pci/hotplug/Kconfig
 ##
@@ -810,7 +804,13 @@ CONFIG_USB_SL811_HCD=m
 CONFIG_USB_SL811_CS=m
 
 ##
-## file: drivers/video/Kconfig
+## file: drivers/video/console/Kconfig
+##
+CONFIG_VGA_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+
+##
+## file: drivers/video/fbdev/Kconfig
 ##
 CONFIG_FB=y
 CONFIG_FB_MODE_HELPERS=y
@@ -851,12 +851,6 @@ CONFIG_FB_TRIDENT=m
 CONFIG_FB_IBM_GXT4500=m
 # CONFIG_FB_VIRTUAL is not set
 
-##
-## file: drivers/video/console/Kconfig
-##
-CONFIG_VGA_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-
 ##
 ## file: drivers/watchdog/Kconfig
 ##
@@ -1019,3 +1013,9 @@ CONFIG_SND_HDA_INTEL=m
 CONFIG_SND_POWERMAC=m
 CONFIG_SND_POWERMAC_AUTO_DRC=y
 
+##
+## file: unknown
+##
+CONFIG_NETPOLL_TRAP=y
+CONFIG_PROC_DEVICETREE=y
+
diff --git a/debian/config/kernelarch-powerpc/config-arch-64 b/debian/config/kernelarch-powerpc/config-arch-64
index 0748ce68e..8cab33d2e 100644
--- a/debian/config/kernelarch-powerpc/config-arch-64
+++ b/debian/config/kernelarch-powerpc/config-arch-64
@@ -1,6 +1,7 @@
 ##
 ## file: arch/powerpc/Kconfig
 ##
+CONFIG_PPC_TRANSACTIONAL_MEM=y
 # CONFIG_CRASH_DUMP is not set
 CONFIG_IRQ_ALL_CPUS=y
 CONFIG_NUMA=y
@@ -10,7 +11,6 @@ CONFIG_NUMA=y
 CONFIG_SCHED_SMT=y
 CONFIG_CMDLINE="console=hvsi0 console=hvc0 console=ttyS0,9600 console=tty0"
 CONFIG_KERNEL_START=0xc000000000000000
-CONFIG_PPC_TRANSACTIONAL_MEM=y
 
 ##
 ## file: arch/powerpc/platforms/Kconfig
@@ -51,10 +51,6 @@ CONFIG_PATA_AMD=m
 # CONFIG_MAC_FLOPPY is not set
 CONFIG_BLK_DEV_RSXX=m
 
-##
-## file: drivers/char/hw_random/Kconfig
-##
-
 ##
 ## file: drivers/net/ethernet/ibm/Kconfig
 ##
@@ -106,7 +102,7 @@ CONFIG_HVCS=m
 # CONFIG_SERIAL_ICOM is not set
 
 ##
-## file: drivers/video/Kconfig
+## file: drivers/video/fbdev/Kconfig
 ##
 # CONFIG_FB_CONTROL is not set
 # CONFIG_FB_PLATINUM is not set
diff --git a/debian/config/kernelarch-powerpc/config-arch-64-be b/debian/config/kernelarch-powerpc/config-arch-64-be
index 486c347b3..fc9a60a9c 100644
--- a/debian/config/kernelarch-powerpc/config-arch-64-be
+++ b/debian/config/kernelarch-powerpc/config-arch-64-be
@@ -1,8 +1,3 @@
-##
-## file: arch/powerpc/platforms/Kconfig.cputype
-##
-CONFIG_NR_CPUS=32
-
 ##
 ## file: arch/powerpc/platforms/cell/Kconfig
 ##
@@ -13,6 +8,11 @@ CONFIG_SPU_FS_64K_LS=y
 CONFIG_CBE_RAS=y
 CONFIG_CBE_THERM=m
 
+##
+## file: arch/powerpc/platforms/Kconfig.cputype
+##
+CONFIG_NR_CPUS=32
+
 ##
 ## file: arch/powerpc/platforms/maple/Kconfig
 ##
@@ -83,7 +83,7 @@ CONFIG_SPIDER_NET=m
 CONFIG_RTC_DRV_PS3=m
 
 ##
-## file: drivers/video/Kconfig
+## file: drivers/video/fbdev/Kconfig
 ##
 CONFIG_FB_PS3=y
 CONFIG_FB_PS3_DEFAULT_SIZE_M=9
diff --git a/debian/config/kernelarch-powerpc/config-arch-64-le b/debian/config/kernelarch-powerpc/config-arch-64-le
index 367001a0b..54a8e3d27 100644
--- a/debian/config/kernelarch-powerpc/config-arch-64-le
+++ b/debian/config/kernelarch-powerpc/config-arch-64-le
@@ -9,11 +9,11 @@ CONFIG_PPC_64K_PAGES=y
 ##
 ## file: arch/powerpc/platforms/Kconfig.cputype
 ##
+CONFIG_NR_CPUS=2048
 ## choice: Endianness selection
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CPU_LITTLE_ENDIAN=y
 ## end choice
-CONFIG_NR_CPUS=2048
 
 ##
 ## file: arch/powerpc/platforms/powermac/Kconfig
diff --git a/debian/config/kernelarch-sparc/config b/debian/config/kernelarch-sparc/config
index e9db83b18..30d1c8a86 100644
--- a/debian/config/kernelarch-sparc/config
+++ b/debian/config/kernelarch-sparc/config
@@ -113,6 +113,7 @@ CONFIG_USB_HID=y
 # CONFIG_SENSORS_F71805F is not set
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_LM63 is not set
 # CONFIG_SENSORS_LM75 is not set
 # CONFIG_SENSORS_LM77 is not set
@@ -123,7 +124,6 @@ CONFIG_USB_HID=y
 # CONFIG_SENSORS_LM87 is not set
 # CONFIG_SENSORS_LM90 is not set
 # CONFIG_SENSORS_LM92 is not set
-# CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_SIS5595 is not set
@@ -267,7 +267,6 @@ CONFIG_SERIO_LIBPS2=y
 ## file: drivers/net/Kconfig
 ##
 CONFIG_NET_FC=y
-# CONFIG_NETPOLL_TRAP is not set
 
 ##
 ## file: drivers/net/arcnet/Kconfig
@@ -479,7 +478,17 @@ CONFIG_USB_UHCI_HCD=m
 # CONFIG_USB_SL811_HCD is not set
 
 ##
-## file: drivers/video/Kconfig
+## file: drivers/video/backlight/Kconfig
+##
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+##
+## file: drivers/video/console/Kconfig
+##
+CONFIG_FRAMEBUFFER_CONSOLE=y
+
+##
+## file: drivers/video/fbdev/Kconfig
 ##
 CONFIG_FB=y
 CONFIG_FB_MODE_HELPERS=y
@@ -520,16 +529,6 @@ CONFIG_FB_ATY_GX=y
 # CONFIG_FB_TRIDENT is not set
 # CONFIG_FB_VIRTUAL is not set
 
-##
-## file: drivers/video/backlight/Kconfig
-##
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-
-##
-## file: drivers/video/console/Kconfig
-##
-CONFIG_FRAMEBUFFER_CONSOLE=y
-
 ##
 ## file: drivers/w1/Kconfig
 ##
@@ -643,3 +642,8 @@ CONFIG_SND_SUN_AMD7930=m
 CONFIG_SND_SUN_CS4231=m
 CONFIG_SND_SUN_DBRI=m
 
+##
+## file: unknown
+##
+# CONFIG_NETPOLL_TRAP is not set
+
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index e69562114..8cf7b8ad6 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -33,9 +33,9 @@ CONFIG_X86_MCE_AMD=y
 CONFIG_X86_MCE_INJECT=m
 CONFIG_I8K=m
 CONFIG_MICROCODE=y
-CONFIG_MICROCODE_EARLY=y
 CONFIG_MICROCODE_INTEL=y
 CONFIG_MICROCODE_AMD=y
+CONFIG_MICROCODE_EARLY=y
 CONFIG_X86_MSR=m
 CONFIG_X86_CPUID=m
 CONFIG_NODES_SHIFT=6
@@ -52,7 +52,6 @@ CONFIG_X86_SMAP=y
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y
 CONFIG_SECCOMP=y
-CONFIG_CC_STACKPROTECTOR=y
 CONFIG_KEXEC=y
 CONFIG_CRASH_DUMP=y
 # CONFIG_KEXEC_JUMP is not set
@@ -155,10 +154,7 @@ CONFIG_CRYPTO_AES_NI_INTEL=m
 ## file: drivers/acpi/Kconfig
 ##
 CONFIG_ACPI=y
-# CONFIG_ACPI_PROCFS is not set
-# CONFIG_ACPI_PROCFS_POWER is not set
 # CONFIG_ACPI_EC_DEBUGFS is not set
-# CONFIG_ACPI_PROC_EVENT is not set
 CONFIG_ACPI_AC=m
 CONFIG_ACPI_BATTERY=m
 CONFIG_ACPI_BUTTON=m
@@ -542,6 +538,7 @@ CONFIG_SENSORS_F71805F=m
 CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
 CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_MAX1619=m
 CONFIG_SENSORS_LM63=m
 CONFIG_SENSORS_LM75=m
 CONFIG_SENSORS_LM77=m
@@ -552,7 +549,6 @@ CONFIG_SENSORS_LM85=m
 CONFIG_SENSORS_LM87=m
 CONFIG_SENSORS_LM90=m
 CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_MAX1619=m
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PCF8591=m
 CONFIG_SENSORS_SIS5595=m
@@ -694,8 +690,8 @@ CONFIG_ISDN_CAPI=m
 ## file: drivers/isdn/capi/Kconfig
 ##
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPIDRV=m
 
 ##
@@ -852,8 +848,6 @@ CONFIG_MTD_MTDRAM=m
 CONFIG_MTDRAM_TOTAL_SIZE=4096
 CONFIG_MTDRAM_ERASE_SIZE=128
 CONFIG_MTD_BLOCK2MTD=m
-# CONFIG_MTD_DOCPROBE_ADVANCED is not set
-CONFIG_MTD_DOCPROBE_ADDRESS=0
 
 ##
 ## file: drivers/mtd/maps/Kconfig
@@ -889,7 +883,6 @@ CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
 ##
 CONFIG_DUMMY=m
 CONFIG_NET_FC=y
-# CONFIG_NETPOLL_TRAP is not set
 CONFIG_NET_SB1000=m
 
 ##
@@ -1169,7 +1162,7 @@ CONFIG_TCIC=m
 # CONFIG_PCMCIA_DEBUG is not set
 
 ##
-## file: drivers/platform/chromeos/Kconfig
+## file: drivers/platform/chrome/Kconfig
 ##
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHROMEOS_LAPTOP=m
@@ -1307,11 +1300,6 @@ CONFIG_SFI=y
 ##
 CONFIG_SPI_TOPCLIFF_PCH=m
 
-##
-## file: drivers/staging/asus_oled/Kconfig
-##
-CONFIG_ASUS_OLED=m
-
 ##
 ## file: drivers/staging/comedi/Kconfig
 ##
@@ -1326,7 +1314,10 @@ CONFIG_COMEDI_TEST=m
 CONFIG_COMEDI_PARPORT=m
 CONFIG_COMEDI_SERIAL2002=m
 # CONFIG_COMEDI_SKEL is not set
+CONFIG_COMEDI_SSV_DNP=m
 # CONFIG_COMEDI_ISA_DRIVERS is not set
+CONFIG_COMEDI_UNIOXX5=m
+CONFIG_COMEDI_II_PCI20KC=m
 CONFIG_COMEDI_S526=m
 CONFIG_COMEDI_PCI_DRIVERS=y
 CONFIG_COMEDI_8255_PCI=m
@@ -1359,11 +1350,9 @@ CONFIG_COMEDI_CONTEC_PCI_DIO=m
 CONFIG_COMEDI_DAS08_PCI=m
 CONFIG_COMEDI_DT3000=m
 CONFIG_COMEDI_DYNA_PCI10XX=m
-CONFIG_COMEDI_UNIOXX5=m
 CONFIG_COMEDI_GSC_HPDI=m
 CONFIG_COMEDI_MF6X4=m
 CONFIG_COMEDI_ICP_MULTI=m
-CONFIG_COMEDI_II_PCI20KC=m
 CONFIG_COMEDI_DAQBOARD2000=m
 CONFIG_COMEDI_JR3_PCI=m
 CONFIG_COMEDI_KE_COUNTER=m
@@ -1383,7 +1372,6 @@ CONFIG_COMEDI_NI_PCIDIO=m
 CONFIG_COMEDI_NI_PCIMIO=m
 CONFIG_COMEDI_RTD520=m
 CONFIG_COMEDI_S626=m
-CONFIG_COMEDI_SSV_DNP=m
 CONFIG_COMEDI_PCMCIA_DRIVERS=y
 CONFIG_COMEDI_CB_DAS16_CS=m
 CONFIG_COMEDI_DAS08_CS=m
@@ -1461,11 +1449,6 @@ CONFIG_LIRC_SERIAL_TRANSMITTER=y
 CONFIG_LIRC_SIR=m
 CONFIG_LIRC_ZILOG=m
 
-##
-## file: drivers/staging/rtl8187se/Kconfig
-##
-CONFIG_R8187SE=m
-
 ##
 ## file: drivers/staging/rtl8188eu/Kconfig
 ##
@@ -1486,11 +1469,6 @@ CONFIG_RTLLIB_CRYPTO_WEP=m
 ##
 CONFIG_RTL8192E=m
 
-##
-## file: drivers/staging/rtl8192ee/Kconfig
-##
-CONFIG_R8192EE=m
-
 ##
 ## file: drivers/staging/rtl8192u/Kconfig
 ##
@@ -1618,9 +1596,14 @@ CONFIG_VFIO_PCI=m
 CONFIG_VFIO_PCI_VGA=y
 
 ##
-## file: drivers/video/Kconfig
+## file: drivers/video/console/Kconfig
+##
+CONFIG_VGA_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+
+##
+## file: drivers/video/fbdev/Kconfig
 ##
-CONFIG_VIDEO_OUTPUT_CONTROL=m
 CONFIG_FB=y
 CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_TILEBLITTING=y
@@ -1668,13 +1651,7 @@ CONFIG_FB_HYPERV=m
 CONFIG_FB_SIMPLE=y
 
 ##
-## file: drivers/video/console/Kconfig
-##
-CONFIG_VGA_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-
-##
-## file: drivers/video/geode/Kconfig
+## file: drivers/video/fbdev/geode/Kconfig
 ##
 # CONFIG_FB_GEODE is not set
 
@@ -1895,5 +1872,20 @@ CONFIG_SND_YMFPCI=m
 ## file: sound/pci/hda/Kconfig
 ##
 CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA_I915=y
+
+##
+## file: unknown
+##
+# CONFIG_ACPI_PROCFS is not set
+# CONFIG_ACPI_PROCFS_POWER is not set
+# CONFIG_ACPI_PROC_EVENT is not set
+CONFIG_ASUS_OLED=m
+CONFIG_CC_STACKPROTECTOR=y
+CONFIG_MTD_DOCPROBE_ADDRESS=0
+# CONFIG_MTD_DOCPROBE_ADVANCED is not set
+# CONFIG_NETPOLL_TRAP is not set
+CONFIG_R8187SE=m
+CONFIG_R8192EE=m
+CONFIG_SND_HDA_I915=y
+CONFIG_VIDEO_OUTPUT_CONTROL=m
 
diff --git a/debian/config/kernelarch-x86/config-arch-32 b/debian/config/kernelarch-x86/config-arch-32
index 1077a04c0..a37cd42dd 100644
--- a/debian/config/kernelarch-x86/config-arch-32
+++ b/debian/config/kernelarch-x86/config-arch-32
@@ -62,11 +62,6 @@ CONFIG_CRYPTO_SALSA20_586=m
 CONFIG_CRYPTO_SERPENT_SSE2_586=m
 CONFIG_CRYPTO_TWOFISH_586=m
 
-##
-## file: drivers/acpi/Kconfig
-##
-CONFIG_ACPI_BLACKLIST_YEAR=0
-
 ##
 ## file: drivers/ata/Kconfig
 ##
@@ -414,7 +409,6 @@ CONFIG_COMEDI_PCMDA12=m
 CONFIG_COMEDI_PCMMIO=m
 CONFIG_COMEDI_PCMUIO=m
 CONFIG_COMEDI_MULTIQ3=m
-CONFIG_COMEDI_POC=m
 
 ##
 ## file: drivers/staging/olpc_dcon/Kconfig
@@ -434,7 +428,12 @@ CONFIG_FB_OLPC_DCON_1_5=y
 CONFIG_SERIAL_8250_EXAR_ST16C554=m
 
 ##
-## file: drivers/video/Kconfig
+## file: drivers/video/console/Kconfig
+##
+CONFIG_MDA_CONSOLE=m
+
+##
+## file: drivers/video/fbdev/Kconfig
 ##
 CONFIG_FB_I810=m
 CONFIG_FB_I810_GTF=y
@@ -444,11 +443,6 @@ CONFIG_FB_MATROX_MAVEN=m
 CONFIG_FB_ATY_GENERIC_LCD=y
 CONFIG_FB_SAVAGE_I2C=y
 
-##
-## file: drivers/video/console/Kconfig
-##
-CONFIG_MDA_CONSOLE=m
-
 ##
 ## file: drivers/watchdog/Kconfig
 ##
@@ -529,3 +523,9 @@ CONFIG_SND_MSND_CLASSIC=m
 ##
 CONFIG_SND_SIS7019=m
 
+##
+## file: unknown
+##
+CONFIG_ACPI_BLACKLIST_YEAR=0
+CONFIG_COMEDI_POC=m
+
diff --git a/debian/config/kernelarch-x86/config-arch-64 b/debian/config/kernelarch-x86/config-arch-64
index 06e458115..e46d3422e 100644
--- a/debian/config/kernelarch-x86/config-arch-64
+++ b/debian/config/kernelarch-x86/config-arch-64
@@ -128,7 +128,7 @@ CONFIG_MOXA_INTELLIO=m
 CONFIG_ISI=m
 
 ##
-## file: drivers/video/Kconfig
+## file: drivers/video/fbdev/Kconfig
 ##
 CONFIG_FB_MATROX_G=y
 CONFIG_FB_MATROX_MAVEN=m
diff --git a/debian/config/m68k/config b/debian/config/m68k/config
index 870801af3..8b02bdf8f 100644
--- a/debian/config/m68k/config
+++ b/debian/config/m68k/config
@@ -556,7 +556,17 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 # CONFIG_VHOST_NET is not set
 
 ##
-## file: drivers/video/Kconfig
+## file: drivers/video/backlight/Kconfig
+##
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+##
+## file: drivers/video/console/Kconfig
+##
+CONFIG_FRAMEBUFFER_CONSOLE=y
+
+##
+## file: drivers/video/fbdev/Kconfig
 ##
 CONFIG_FB=y
 # CONFIG_FIRMWARE_EDID is not set
@@ -583,16 +593,6 @@ CONFIG_FB_ATY=y
 # CONFIG_FB_VIRTUAL is not set
 # CONFIG_FB_METRONOME is not set
 
-##
-## file: drivers/video/backlight/Kconfig
-##
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-
-##
-## file: drivers/video/console/Kconfig
-##
-CONFIG_FRAMEBUFFER_CONSOLE=y
-
 ##
 ## file: drivers/video/logo/Kconfig
 ##
diff --git a/debian/config/mips/config b/debian/config/mips/config
index 1d9268526..5942c9ab9 100644
--- a/debian/config/mips/config
+++ b/debian/config/mips/config
@@ -5,3 +5,4 @@
 CONFIG_CPU_BIG_ENDIAN=y
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 ## end choice
+
diff --git a/debian/config/mips64/config b/debian/config/mips64/config
index 1d9268526..5942c9ab9 100644
--- a/debian/config/mips64/config
+++ b/debian/config/mips64/config
@@ -5,3 +5,4 @@
 CONFIG_CPU_BIG_ENDIAN=y
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 ## end choice
+
diff --git a/debian/config/powerpc/config.powerpc b/debian/config/powerpc/config.powerpc
index 94486a887..61b139fce 100644
--- a/debian/config/powerpc/config.powerpc
+++ b/debian/config/powerpc/config.powerpc
@@ -83,7 +83,7 @@ CONFIG_SERIAL_MPC52xx_CONSOLE=y
 CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
 
 ##
-## file: drivers/video/Kconfig
+## file: drivers/video/fbdev/Kconfig
 ##
 CONFIG_FB_CONTROL=y
 CONFIG_FB_PLATINUM=y
diff --git a/debian/config/sh4/config.sh7751r b/debian/config/sh4/config.sh7751r
index 11b4e32d2..10164d176 100644
--- a/debian/config/sh4/config.sh7751r
+++ b/debian/config/sh4/config.sh7751r
@@ -4,7 +4,6 @@
 ## choice: Processor sub-type selection
 CONFIG_CPU_SUBTYPE_SH7751R=y
 ## end choice
-CONFIG_SH_TIMER_TMU=y
 CONFIG_SH_PCLK_FREQ=60000000
 CONFIG_PCI=y
 
@@ -47,6 +46,11 @@ CONFIG_SATA_PMP=y
 CONFIG_ATA_SFF=y
 CONFIG_PATA_PLATFORM=y
 
+##
+## file: drivers/clocksource/Kconfig
+##
+CONFIG_SH_TIMER_TMU=y
+
 ##
 ## file: drivers/hid/Kconfig
 ##
@@ -76,7 +80,6 @@ CONFIG_MFD_SM501=y
 ## file: drivers/mtd/Kconfig
 ##
 CONFIG_MTD=y
-CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y
 
 ##
@@ -151,17 +154,17 @@ CONFIG_USB=y
 ##
 CONFIG_USB_OHCI_HCD=y
 
-##
-## file: drivers/video/Kconfig
-##
-CONFIG_FB=y
-CONFIG_FB_SM501=y
-
 ##
 ## file: drivers/video/console/Kconfig
 ##
 CONFIG_FRAMEBUFFER_CONSOLE=y
 
+##
+## file: drivers/video/fbdev/Kconfig
+##
+CONFIG_FB=y
+CONFIG_FB_SM501=y
+
 ##
 ## file: mm/Kconfig
 ##
@@ -169,3 +172,8 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FLATMEM_MANUAL=y
 ## end choice
 
+##
+## file: unknown
+##
+CONFIG_MTD_BLKDEVS=y
+
diff --git a/debian/config/sh4/config.sh7785lcr b/debian/config/sh4/config.sh7785lcr
index 470037af6..4d934ac03 100644
--- a/debian/config/sh4/config.sh7785lcr
+++ b/debian/config/sh4/config.sh7785lcr
@@ -4,7 +4,6 @@
 ## choice: Processor sub-type selection
 CONFIG_CPU_SUBTYPE_SH7785=y
 ## end choice
-CONFIG_SH_TIMER_TMU=y
 CONFIG_SH_PCLK_FREQ=50000000
 CONFIG_PCI=y
 
@@ -46,6 +45,11 @@ CONFIG_SATA_PMP=y
 CONFIG_ATA_SFF=y
 CONFIG_SATA_SIL=y
 
+##
+## file: drivers/clocksource/Kconfig
+##
+CONFIG_SH_TIMER_TMU=y
+
 ##
 ## file: drivers/dma/Kconfig
 ##
@@ -121,7 +125,6 @@ CONFIG_MFD_SM501=y
 ## file: drivers/mtd/Kconfig
 ##
 CONFIG_MTD=y
-CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y
 
 ##
@@ -197,17 +200,17 @@ CONFIG_USB_R8A66597_HCD=y
 ##
 CONFIG_USB_STORAGE=y
 
-##
-## file: drivers/video/Kconfig
-##
-CONFIG_FB=y
-CONFIG_FB_SM501=y
-
 ##
 ## file: drivers/video/console/Kconfig
 ##
 CONFIG_FRAMEBUFFER_CONSOLE=y
 
+##
+## file: drivers/video/fbdev/Kconfig
+##
+CONFIG_FB=y
+CONFIG_FB_SM501=y
+
 ##
 ## file: drivers/watchdog/Kconfig
 ##
@@ -224,3 +227,8 @@ CONFIG_SPARSEMEM_MANUAL=y
 CONFIG_MIGRATION=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 
+##
+## file: unknown
+##
+CONFIG_MTD_BLKDEVS=y
+