debian/config: Reorder config.

svn path=/dists/trunk/linux/; revision=20574
2013-09-08 14:24:32 +00:00 · 2013-09-08 14:24:32 +00:00 · 2f58661684
parent 07c6fc5457
commit 2f58661684
41 changed files with 595 additions and 564 deletions
--- a/debian/config/alpha/config
+++ b/debian/config/alpha/config
@ -155,7 +155,6 @@ CONFIG_BT_HCIVHCI=m
 ##
 ## file: drivers/char/Kconfig
 ##
-CONFIG_STALDRV=y
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_PPDEV=m
@ -202,13 +201,17 @@ CONFIG_DRM_RADEON=m
 CONFIG_DRM_MGA=m
 CONFIG_DRM_SIS=m

+##
+## file: drivers/gpu/drm/i2c/Kconfig
+##
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+
 ##
 ## file: drivers/gpu/drm/nouveau/Kconfig
 ##
 CONFIG_DRM_NOUVEAU=m
 # CONFIG_DRM_NOUVEAU_BACKLIGHT is not set
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_DRM_I2C_SIL164=m

 ##
 ## file: drivers/hid/usbhid/Kconfig
@ -428,7 +431,6 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
 CONFIG_MTD_REDBOOT_PARTS_READONLY=y
 CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_CHAR=m
 CONFIG_MTD_BLOCK=m
 CONFIG_MTD_BLOCK_RO=m
 CONFIG_FTL=m
@ -479,9 +481,6 @@ CONFIG_MTD_MTDRAM=m
 CONFIG_MTDRAM_TOTAL_SIZE=4096
 CONFIG_MTDRAM_ERASE_SIZE=128
 CONFIG_MTD_BLOCK2MTD=m
-CONFIG_MTD_DOC2000=m
-CONFIG_MTD_DOC2001=m
-CONFIG_MTD_DOC2001PLUS=m
 CONFIG_MTD_DOCPROBE_ADVANCED=y
 CONFIG_MTD_DOCPROBE_ADDRESS=0x0000
 CONFIG_MTD_DOCPROBE_HIGH=y
@ -575,10 +574,6 @@ CONFIG_B44=m
 ##
 CONFIG_CS89x0=m

-##
-## file: drivers/net/ethernet/dec/Kconfig
-##
-
 ##
 ## file: drivers/net/ethernet/dec/tulip/Kconfig
 ##
@ -623,11 +618,6 @@ CONFIG_NATSEMI=m
 ##
 CONFIG_FORCEDETH=m

-##
-## file: drivers/net/ethernet/racal/Kconfig
-##
-CONFIG_NET_VENDOR_RACAL=y
-
 ##
 ## file: drivers/net/ethernet/realtek/Kconfig
 ##
@ -638,10 +628,6 @@ CONFIG_8139TOO_TUNE_TWISTER=y
 CONFIG_8139TOO_8129=y
 # CONFIG_8139_OLD_RX_RESET is not set

-##
-## file: drivers/net/ethernet/seeq/Kconfig
-##
-
 ##
 ## file: drivers/net/ethernet/sis/Kconfig
 ##
@ -848,12 +834,6 @@ CONFIG_PCMCIA_FDOMAIN=m
 CONFIG_PCMCIA_QLOGIC=m
 CONFIG_PCMCIA_SYM53C500=m

-##
-## file: drivers/staging/net/Kconfig
-##
-CONFIG_PC300=m
-CONFIG_PC300_MLPPP=y
-
 ##
 ## file: drivers/tty/Kconfig
 ##
@ -960,9 +940,6 @@ CONFIG_LCD_CLASS_DEVICE=m
 CONFIG_VGA_CONSOLE=y
 CONFIG_MDA_CONSOLE=m
 CONFIG_FRAMEBUFFER_CONSOLE=m
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y

 ##
 ## file: drivers/watchdog/Kconfig
@ -993,6 +970,13 @@ CONFIG_BINFMT_EM86=m
 #. TODO
 CONFIG_CRC32=m

+##
+## file: lib/fonts/Kconfig
+##
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+
 ##
 ## file: net/ax25/Kconfig
 ##
@ -1137,5 +1121,13 @@ CONFIG_SND_HDA_INTEL=m
 ##
 # CONFIG_BLK_DEV_UB is not set
 # CONFIG_DRM_NOUVEAU_DEBUG is not set
+CONFIG_MTD_CHAR=m
+CONFIG_MTD_DOC2000=m
+CONFIG_MTD_DOC2001=m
+CONFIG_MTD_DOC2001PLUS=m
 # CONFIG_MTD_NAND_VERIFY_WRITE is not set
+CONFIG_NET_VENDOR_RACAL=y
+CONFIG_PC300=m
+CONFIG_PC300_MLPPP=y
+CONFIG_STALDRV=y

--- a/debian/config/armel/config-reduced
+++ b/debian/config/armel/config-reduced
@ -19,18 +19,14 @@
 ##
 # CONFIG_VGA_ARB is not set

-##
-## file: drivers/pci/Kconfig
-##
-#. Saves about 17K, and none of the quirks are likely to be needed
-# CONFIG_PCI_QUIRKS is not set
-
 ##
 ## file: init/Kconfig
 ##
 # CONFIG_AUDITSYSCALL is not set
 CONFIG_EXPERT=y
 # CONFIG_SYSCTL_SYSCALL is not set
+#. Saves about 17K, and none of the quirks are likely to be needed
+# CONFIG_PCI_QUIRKS is not set

 ##
 ## file: kernel/trace/Kconfig
--- a/debian/config/armel/config.kirkwood
+++ b/debian/config/armel/config.kirkwood
@ -11,7 +11,6 @@
 # CONFIG_ARCH_EP93XX is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
 # CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_H720X is not set
 # CONFIG_ARCH_IOP13XX is not set
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
@ -24,7 +23,6 @@ CONFIG_ARCH_KIRKWOOD=y
 # CONFIG_ARCH_SA1100 is not set
 # CONFIG_ARCH_SHARK is not set
 # CONFIG_ARCH_DAVINCI is not set
-# CONFIG_ARCH_OMAP is not set
 ## end choice
 CONFIG_PCI=y
 CONFIG_UACCESS_WITH_MEMCPY=y
@ -50,47 +48,45 @@ CONFIG_FPE_NWFPE=y
 ##
 ## file: arch/arm/mach-kirkwood/Kconfig
 ##
-CONFIG_MACH_DB88F6281_BP=y
-CONFIG_MACH_RD88F6192_NAS=y
-CONFIG_MACH_RD88F6281=y
-CONFIG_MACH_MV88F6281GTW_GE=y
-CONFIG_MACH_SHEEVAPLUG=y
+CONFIG_MACH_D2NET_V2=y
+CONFIG_MACH_DOCKSTAR=y
 CONFIG_MACH_ESATA_SHEEVAPLUG=y
 CONFIG_MACH_GURUPLUG=y
-CONFIG_ARCH_KIRKWOOD_DT=y
-CONFIG_MACH_GURUPLUG_DT=y
-CONFIG_MACH_DREAMPLUG_DT=y
-CONFIG_MACH_ICONNECT_DT=y
-CONFIG_MACH_DLINK_KIRKWOOD_DT=y
-CONFIG_MACH_IB62X0_DT=y
-CONFIG_MACH_TS219_DT=y
-CONFIG_MACH_DOCKSTAR_DT=y
-CONFIG_MACH_GOFLEXNET_DT=y
-CONFIG_MACH_LSXL_DT=y
-CONFIG_MACH_IOMEGA_IX2_200_DT=y
-CONFIG_MACH_KM_KIRKWOOD_DT=y
-CONFIG_MACH_INETSPACE_V2_DT=y
-CONFIG_MACH_MPLCEC4_DT=y
-CONFIG_MACH_NETSPACE_V2_DT=y
-CONFIG_MACH_NETSPACE_MAX_V2_DT=y
-CONFIG_MACH_NETSPACE_LITE_V2_DT=y
-CONFIG_MACH_NETSPACE_MINI_V2_DT=y
-CONFIG_MACH_OPENBLOCKS_A6_DT=y
-CONFIG_MACH_TOPKICK_DT=y
-CONFIG_MACH_TS219=y
-CONFIG_MACH_TS41X=y
-CONFIG_MACH_DOCKSTAR=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_NETSPACE_V2=y
-CONFIG_MACH_INETSPACE_V2=y
-CONFIG_MACH_NETSPACE_MAX_V2=y
-CONFIG_MACH_D2NET_V2=y
-CONFIG_MACH_NET2BIG_V2=y
-CONFIG_MACH_NET5BIG_V2=y
+CONFIG_MACH_RD88F6192_NAS=y
+CONFIG_MACH_RD88F6281=y
+CONFIG_MACH_SHEEVAPLUG=y
 CONFIG_MACH_T5325=y
-CONFIG_MACH_NSA310_DT=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
@ -299,6 +295,10 @@ CONFIG_ISDN_DIVAS_MAINT=m
 CONFIG_LEDS_GPIO=y
 CONFIG_LEDS_NS2=m
 CONFIG_LEDS_NETXBIG=m
+
+##
+## file: drivers/leds/trigger/Kconfig
+##
 CONFIG_LEDS_TRIGGER_TIMER=y
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y

@ -325,7 +325,6 @@ CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 # CONFIG_MTD_AFS_PARTS is not set
 CONFIG_MTD_OF_PARTS=y
-CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLOCK=y
 CONFIG_FTL=m
 CONFIG_NFTL=m
@ -374,9 +373,6 @@ CONFIG_MTD_M25P80=y
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_MTDRAM is not set
 # CONFIG_MTD_BLOCK2MTD is not set
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set

 ##
 ## file: drivers/mtd/maps/Kconfig
@ -392,7 +388,6 @@ CONFIG_MTD_PHYSMAP_OF=y
 ##
 # CONFIG_MTD_NAND_ECC_SMC is not set
 CONFIG_MTD_NAND=y
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_CAFE is not set
 # CONFIG_MTD_ALAUDA is not set
@ -503,7 +498,7 @@ CONFIG_PROC_DEVICETREE=y
 # CONFIG_PCCARD is not set

 ##
-## file: drivers/power/Kconfig
+## file: drivers/power/reset/Kconfig
 ##
 CONFIG_POWER_RESET_QNAP=y
 CONFIG_POWER_RESET_RESTART=y
@ -710,8 +705,16 @@ CONFIG_SND_KIRKWOOD_SOC_T5325=m
 ##
 ## file: unknown
 ##
+# CONFIG_ARCH_H720X is not set
 # CONFIG_ARCH_PNX4008 is not set
 CONFIG_LEDS=y
 CONFIG_LEDS_CPU=y
+CONFIG_MACH_DB88F6281_BP=y
+CONFIG_MACH_NSA310_DT=y
+CONFIG_MTD_CHAR=y
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
 # CONFIG_MTD_NAND_VERIFY_WRITE is not set

--- a/debian/config/armel/config.mv78xx0
+++ b/debian/config/armel/config.mv78xx0
@ -12,7 +12,6 @@ CONFIG_MMU=y
 # CONFIG_ARCH_EP93XX is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
 # CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_H720X is not set
 # CONFIG_ARCH_IOP13XX is not set
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
@ -25,7 +24,6 @@ CONFIG_ARCH_MV78XX0=y
 # CONFIG_ARCH_SA1100 is not set
 # CONFIG_ARCH_SHARK is not set
 # CONFIG_ARCH_DAVINCI is not set
-# CONFIG_ARCH_OMAP is not set
 ## end choice
 CONFIG_PCI=y
 CONFIG_HIGHMEM=y
@ -257,6 +255,10 @@ CONFIG_ISDN_DIVAS_MAINT=m
 ## file: drivers/leds/Kconfig
 ##
 CONFIG_LEDS_GPIO=y
+
+##
+## file: drivers/leds/trigger/Kconfig
+##
 CONFIG_LEDS_TRIGGER_TIMER=y
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y

@ -267,7 +269,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_CHAR=y
 CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y
 CONFIG_FTL=m
@ -318,9 +319,6 @@ CONFIG_MTD_CFI_STAA=m
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_MTDRAM is not set
 # CONFIG_MTD_BLOCK2MTD is not set
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set

 ##
 ## file: drivers/mtd/maps/Kconfig
@ -335,7 +333,6 @@ CONFIG_MTD_CFI_STAA=m
 ##
 # CONFIG_MTD_NAND_ECC_SMC is not set
 CONFIG_MTD_NAND=y
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_CAFE is not set
 # CONFIG_MTD_ALAUDA is not set
@ -574,8 +571,14 @@ CONFIG_ROSE=m
 ##
 ## file: unknown
 ##
+# CONFIG_ARCH_H720X is not set
 # CONFIG_ARCH_PNX4008 is not set
 CONFIG_LEDS=y
 CONFIG_LEDS_CPU=y
+CONFIG_MTD_CHAR=y
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
 CONFIG_MTD_NAND_VERIFY_WRITE=y

--- a/debian/config/armel/config.orion5x
+++ b/debian/config/armel/config.orion5x
@ -11,7 +11,6 @@
 # CONFIG_ARCH_EP93XX is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
 # CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_H720X is not set
 # CONFIG_ARCH_IOP13XX is not set
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
@ -23,7 +22,6 @@ CONFIG_ARCH_ORION5X=y
 # CONFIG_ARCH_SA1100 is not set
 # CONFIG_ARCH_SHARK is not set
 # CONFIG_ARCH_DAVINCI is not set
-# CONFIG_ARCH_OMAP is not set
 ## end choice
 CONFIG_PCI=y
 CONFIG_UACCESS_WITH_MEMCPY=y
@ -270,6 +268,10 @@ CONFIG_ISDN_DIVAS_MAINT=m
 ## file: drivers/leds/Kconfig
 ##
 CONFIG_LEDS_GPIO=y
+
+##
+## file: drivers/leds/trigger/Kconfig
+##
 CONFIG_LEDS_TRIGGER_TIMER=y
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y

@ -280,7 +282,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_CHAR=y
 CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y
 CONFIG_FTL=m
@ -331,9 +332,6 @@ CONFIG_MTD_CFI_STAA=m
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_MTDRAM is not set
 # CONFIG_MTD_BLOCK2MTD is not set
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set

 ##
 ## file: drivers/mtd/maps/Kconfig
@ -348,7 +346,6 @@ CONFIG_MTD_CFI_STAA=m
 ##
 # CONFIG_MTD_NAND_ECC_SMC is not set
 CONFIG_MTD_NAND=y
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_CAFE is not set
 # CONFIG_MTD_ALAUDA is not set
@ -593,9 +590,15 @@ CONFIG_ROSE=m
 ##
 ## file: unknown
 ##
+# CONFIG_ARCH_H720X is not set
 # CONFIG_ARCH_PNX4008 is not set
 CONFIG_LEDS=y
 CONFIG_LEDS_CPU=y
 CONFIG_MACH_EDMINI_V2=y
+CONFIG_MTD_CHAR=y
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
 CONFIG_MTD_NAND_VERIFY_WRITE=y

--- a/debian/config/armel/config.versatile
+++ b/debian/config/armel/config.versatile
@ -11,7 +11,6 @@ CONFIG_ARCH_VERSATILE=y
 # CONFIG_ARCH_EP93XX is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
 # CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_H720X is not set
 # CONFIG_ARCH_IOP13XX is not set
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
@ -22,7 +21,6 @@ CONFIG_ARCH_VERSATILE=y
 # CONFIG_ARCH_SA1100 is not set
 # CONFIG_ARCH_SHARK is not set
 # CONFIG_ARCH_DAVINCI is not set
-# CONFIG_ARCH_OMAP is not set
 ## end choice
 CONFIG_PCI=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
@ -447,17 +445,6 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=m
 ##
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_10x18 is not set

 ##
 ## file: drivers/virtio/Kconfig
@ -485,8 +472,23 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_UNUSED_SYMBOLS=y
 # CONFIG_HEADERS_CHECK is not set
-CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_FRAME_POINTER is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+
+##
+## file: lib/fonts/Kconfig
+##
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set

 ##
 ## file: mm/Kconfig
@ -522,6 +524,7 @@ CONFIG_IPX_INTERN=y
 ##
 ## file: unknown
 ##
+# CONFIG_ARCH_H720X is not set
 # CONFIG_ARCH_PNX4008 is not set
 # CONFIG_LEDS is not set

--- a/debian/config/armhf/config
+++ b/debian/config/armhf/config
@ -28,3 +28,4 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y
 ##
 CONFIG_THERMAL=y
 CONFIG_CPU_THERMAL=m
+
--- a/debian/config/armhf/config.armmp
+++ b/debian/config/armhf/config.armmp
@ -3,26 +3,24 @@
 ##
 ## choice: ARM system type
 CONFIG_ARCH_MULTIPLATFORM=y
+## end choice
 # CONFIG_ARCH_MULTI_V6 is not set
 CONFIG_ARCH_MULTI_V7=y
-CONFIG_ARCH_MULTI_V6_V7=y
-## end choice
-
-
 CONFIG_SMP=y
 CONFIG_SMP_ON_UP=y
 CONFIG_HIGHMEM=y
-CONFIG_NEON=y
-
 CONFIG_ARM_APPENDED_DTB=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y
+## choice: Kernel command line type
 CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y
 # CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set
+## end choice
+CONFIG_NEON=y

 ##
 ## file: arch/arm/Kconfig.debug
 ##
-# DEBUG_LL is incompatible with multiplatform
+#. DEBUG_LL is incompatible with multiplatform
 # CONFIG_DEBUG_LL is not set

 ##
@ -34,18 +32,13 @@ CONFIG_ARCH_HIGHBANK=y
 ## file: arch/arm/mach-imx/Kconfig
 ##
 CONFIG_ARCH_MXC=y
-
-#
-# Freescale i.MX support
-#
 CONFIG_MXC_IRQ_PRIOR=y
-CONFIG_IRAM_ALLOC=y
-CONFIG_SOC_IMX5=y
-CONFIG_SOC_IMX51=y
 CONFIG_MACH_IMX51_DT=y
 CONFIG_MACH_MX51_BABBAGE=y
 CONFIG_MACH_EUKREA_CPUIMX51SD=y
+## choice: Baseboard
 CONFIG_MACH_EUKREA_MBIMXSD51_BASEBOARD=y
+## end choice
 CONFIG_SOC_IMX53=y
 CONFIG_SOC_IMX6Q=y

@ -53,19 +46,18 @@ CONFIG_SOC_IMX6Q=y
 ## file: arch/arm/mach-mvebu/Kconfig
 ##
 CONFIG_ARCH_MVEBU=y
-CONFIG_MACH_ARMADA_370_XP=y
 CONFIG_MACH_ARMADA_370=y
 CONFIG_MACH_ARMADA_XP=y

 ##
 ## file: arch/arm/mach-omap2/Kconfig
 ##
-CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
 # CONFIG_ARCH_OMAP2 is not set
 CONFIG_SOC_OMAP5=y
+CONFIG_SOC_AM33XX=y
+CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
 CONFIG_SOC_OMAP3430=y
 CONFIG_SOC_TI81XX=y
-CONFIG_SOC_AM33XX=y

 ##
 ## file: arch/arm/mach-socfpga/Kconfig
@ -92,7 +84,6 @@ CONFIG_ARCH_VIRT=y
 ##
 ## file: arch/arm/mach-vt8500/Kconfig
 ##
-CONFIG_ARCH_VT8500=y
 CONFIG_ARCH_WM8850=y

 ##
@ -103,19 +94,13 @@ CONFIG_ARM_THUMBEE=y
 ##
 ## file: arch/arm/plat-omap/Kconfig
 ##
-## choice: OMAP System Type
-CONFIG_ARCH_OMAP2PLUS=y
-## end choice
 CONFIG_OMAP_RESET_CLOCKS=y
 CONFIG_OMAP_MUX=y
 # CONFIG_OMAP_MUX_DEBUG is not set
 CONFIG_OMAP_MUX_WARNINGS=y
-CONFIG_OMAP_MBOX_FWK=y
-CONFIG_OMAP_MBOX_KFIFO_SIZE=256
 # CONFIG_OMAP_MPU_TIMER is not set
 CONFIG_OMAP_32K_TIMER=y
 # CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set
-CONFIG_OMAP_32K_TIMER_HZ=128
 CONFIG_OMAP_DM_TIMER=y
 CONFIG_OMAP_SERIAL_WAKE=y
 ## choice: OMAP PM layer selection
@ -125,10 +110,10 @@ CONFIG_OMAP_PM_NOOP=y
 ##
 ## file: drivers/ata/Kconfig
 ##
+CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_SATA_HIGHBANK=m
 CONFIG_PATA_IMX=m
 CONFIG_PATA_PLATFORM=m
-CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_PATA_OF_PLATFORM=m

 ##
@ -153,51 +138,50 @@ CONFIG_CLK_TWL6040=m
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_STAT=m

+##
+## file: drivers/cpufreq/Kconfig.arm
+##
 CONFIG_ARM_IMX6Q_CPUFREQ=m
-CONFIG_CPU_FREQ_IMX=m

 ##
 ## file: drivers/crypto/Kconfig
 ##
+CONFIG_CRYPTO_DEV_MV_CESA=m
 CONFIG_CRYPTO_DEV_OMAP_SHAM=m
 CONFIG_CRYPTO_DEV_OMAP_AES=m
-CONFIG_CRYPTO_DEV_MV_CESA=m

 ##
 ## file: drivers/dma/Kconfig
 ##
 CONFIG_DMADEVICES=y
-CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
 CONFIG_AMBA_PL08X=y
+CONFIG_MV_XOR=y
 CONFIG_PL330_DMA=y
 CONFIG_IMX_SDMA=y
 CONFIG_IMX_DMA=y
 CONFIG_MXS_DMA=y
 CONFIG_DMA_OMAP=y
-CONFIG_MV_XOR=y

 ##
 ## file: drivers/gpio/Kconfig
 ##
 CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_DA9052=m
 CONFIG_GPIO_TWL4030=y
 CONFIG_GPIO_TWL6040=y
-CONFIG_GPIO_VT8500=y
-CONFIG_GPIO_DA9052=m

 ##
 ## file: drivers/hwspinlock/Kconfig
 ##
-CONFIG_HWSPINLOCK=m
 CONFIG_HWSPINLOCK_OMAP=m

 ##
 ## file: drivers/i2c/busses/Kconfig
 ##
 CONFIG_I2C_GPIO=y
-CONFIG_I2C_OMAP=y
 CONFIG_I2C_IMX=m
 CONFIG_I2C_MV64XXX=m
+CONFIG_I2C_OMAP=y
 CONFIG_I2C_VERSATILE=m

 ##
@ -205,6 +189,11 @@ CONFIG_I2C_VERSATILE=m
 ##
 CONFIG_IIO=m

+##
+## file: drivers/iio/light/Kconfig
+##
+CONFIG_SENSORS_TSL2563=m
+
 ##
 ## file: drivers/input/keyboard/Kconfig
 ##
@ -216,10 +205,10 @@ CONFIG_KEYBOARD_TWL4030=m
 ##
 ## file: drivers/input/misc/Kconfig
 ##
+CONFIG_INPUT_MMA8450=m
 CONFIG_INPUT_TWL4030_PWRBUTTON=m
 CONFIG_INPUT_TWL4030_VIBRA=m
 CONFIG_INPUT_TWL6040_VIBRA=m
-CONFIG_INPUT_MMA8450=m

 ##
 ## file: drivers/input/serio/Kconfig
@ -245,9 +234,18 @@ CONFIG_OMAP_IOVMM=m
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_GPIO=m
 CONFIG_LEDS_LP5523=m
-CONFIG_LEDS_TRIGGER_GPIO=m
 CONFIG_LEDS_DA9052=m

+##
+## file: drivers/leds/trigger/Kconfig
+##
+CONFIG_LEDS_TRIGGER_GPIO=m
+
+##
+## file: drivers/mailbox/Kconfig
+##
+CONFIG_OMAP_MBOX_KFIFO_SIZE=256
+
 ##
 ## file: drivers/media/Kconfig
 ##
@ -274,14 +272,11 @@ CONFIG_RADIO_WL128X=m
 ##
 ## file: drivers/mfd/Kconfig
 ##
-CONFIG_MFD_TI_AM335X_TSCADC=m
-CONFIG_PMIC_DA9052=y
 CONFIG_MFD_DA9052_SPI=y
 CONFIG_MFD_DA9052_I2C=y
-CONFIG_MFD_MC13783=m
-CONFIG_MFD_MC13XXX=m
 CONFIG_MFD_MC13XXX_SPI=m
 CONFIG_MFD_MC13XXX_I2C=m
+CONFIG_MFD_TI_AM335X_TSCADC=m
 CONFIG_TWL6040_CORE=y

 ##
@ -308,8 +303,8 @@ CONFIG_MMC_SDHCI_PLTFM=m
 CONFIG_MMC_SDHCI_ESDHC_IMX=m
 CONFIG_MMC_OMAP=m
 CONFIG_MMC_OMAP_HS=m
-CONFIG_MMC_SPI=m
 CONFIG_MMC_MVSDIO=m
+CONFIG_MMC_SPI=m
 CONFIG_MMC_WMT=m

 ##
@ -402,6 +397,10 @@ CONFIG_WLCORE_SDIO=m
 ##
 CONFIG_BATTERY_BQ27x00=m
 CONFIG_CHARGER_ISP1704=m
+
+##
+## file: drivers/power/reset/Kconfig
+##
 CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_GPIO=y
 CONFIG_POWER_RESET_RESTART=y
@ -413,7 +412,6 @@ CONFIG_PWM=y
 CONFIG_PWM_IMX=m
 CONFIG_PWM_TIECAP=m
 CONFIG_PWM_TIEHRPWM=m
-CONFIG_PWM_TIPWMSS=y
 CONFIG_PWM_TWL=m
 CONFIG_PWM_TWL_LED=m
 CONFIG_PWM_VT8500=m
@ -422,12 +420,11 @@ CONFIG_PWM_VT8500=m
 ## file: drivers/regulator/Kconfig
 ##
 CONFIG_REGULATOR=y
-CONFIG_REGULATOR_TWL4030=y
 CONFIG_REGULATOR_DA9052=m
 CONFIG_REGULATOR_ANATOP=m
-CONFIG_REGULATOR_MC13XXX_CORE=m
 CONFIG_REGULATOR_MC13783=m
 CONFIG_REGULATOR_MC13892=m
+CONFIG_REGULATOR_TWL4030=y
 CONFIG_REGULATOR_VEXPRESS=m

 ##
@ -448,9 +445,9 @@ CONFIG_RTC_DRV_MXC=m
 ##
 CONFIG_SPI=y
 CONFIG_SPI_GPIO=y
+CONFIG_SPI_OMAP24XX=m
 CONFIG_SPI_ORION=m
 CONFIG_SPI_PL022=m
-CONFIG_SPI_OMAP24XX=m
 CONFIG_SPI_SPIDEV=y

 ##
@ -458,11 +455,6 @@ CONFIG_SPI_SPIDEV=y
 ##
 CONFIG_LIS3L02DQ=m

-##
-## file: drivers/staging/iio/light/Kconfig
-##
-CONFIG_SENSORS_TSL2563=m
-
 ##
 ## file: drivers/staging/tidspbridge/Kconfig
 ##
@ -478,15 +470,6 @@ CONFIG_ARMADA_THERMAL=y
 ##
 ## file: drivers/tty/serial/Kconfig
 ##
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_DMA=y
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-# CONFIG_SERIAL_8250_EXTENDED is not set
-CONFIG_SERIAL_8250_DW=y
-# CONFIG_SERIAL_8250_EM is not set
 CONFIG_SERIAL_AMBA_PL010=y
 CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
 CONFIG_SERIAL_AMBA_PL011=y
@ -499,16 +482,36 @@ CONFIG_SERIAL_ARC=y
 CONFIG_SERIAL_ARC_CONSOLE=y
 CONFIG_SERIAL_ARC_NR_PORTS=1

+##
+## file: drivers/tty/serial/8250/Kconfig
+##
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_DMA=y
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+CONFIG_SERIAL_8250_DW=y
+# CONFIG_SERIAL_8250_EM is not set
+
 ##
 ## file: drivers/usb/Kconfig
 ##
 CONFIG_USB=y

+##
+## file: drivers/usb/chipidea/Kconfig
+##
+CONFIG_USB_CHIPIDEA=m
+CONFIG_USB_CHIPIDEA_UDC=y
+CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_CHIPIDEA_DEBUG=y
+
 ##
 ## file: drivers/usb/gadget/Kconfig
 ##
 CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_MUSB_HDRC=y
 ## choice: USB Gadget Drivers
 CONFIG_USB_ETH=m
 CONFIG_USB_ETH_RNDIS=y
@ -520,15 +523,10 @@ CONFIG_USB_G_NOKIA=m
 ## file: drivers/usb/host/Kconfig
 ##
 CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_MXC=m
 CONFIG_USB_EHCI_HCD_OMAP=y
 CONFIG_USB_OHCI_HCD=m
 CONFIG_USB_OHCI_HCD_OMAP3=y
-CONFIG_USB_FSL_MPH_DR_OF=m
-CONFIG_USB_EHCI_MXC=m
-CONFIG_USB_CHIPIDEA=m
-CONFIG_USB_CHIPIDEA_UDC=y
-CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_USB_CHIPIDEA_DEBUG=y

 ##
 ## file: drivers/usb/musb/Kconfig
@ -542,29 +540,21 @@ CONFIG_USB_MUSB_DSPS=m
 CONFIG_MUSB_PIO_ONLY=y
 ## end choice

-##
-## file: drivers/usb/otg/Kconfig
-##
-CONFIG_TWL4030_USB=m
-CONFIG_TWL6030_USB=m
-CONFIG_NOP_USB_XCEIV=y
-CONFIG_USB_MXS_PHY=m
-
 ##
 ## file: drivers/usb/phy/Kconfig
 ##
+CONFIG_NOP_USB_XCEIV=y
+CONFIG_OMAP_CONTROL_USB=m
 CONFIG_OMAP_USB2=m
 CONFIG_OMAP_USB3=m
-CONFIG_OMAP_CONTROL_USB=m
+CONFIG_TWL4030_USB=m
+CONFIG_TWL6030_USB=m
+CONFIG_USB_MXS_PHY=m

 ##
 ## file: drivers/video/Kconfig
 ##
 CONFIG_VIDEO_OUTPUT_CONTROL=y
-CONFIG_DISPLAY_TIMING=y
-CONFIG_VIDEOMODE=y
-CONFIG_OF_DISPLAY_TIMING=y
-CONFIG_OF_VIDEOMODE=y
 CONFIG_FB=y
 CONFIG_FB_ARMCLCD=y
 CONFIG_FB_VT8500=y
@ -597,10 +587,10 @@ CONFIG_FB_OMAP2=m
 ##
 ## file: drivers/watchdog/Kconfig
 ##
-CONFIG_OMAP_WATCHDOG=m
-CONFIG_TWL4030_WATCHDOG=m
 CONFIG_DA9052_WATCHDOG=m
 CONFIG_ARM_SP805_WATCHDOG=m
+CONFIG_OMAP_WATCHDOG=m
+CONFIG_TWL4030_WATCHDOG=m
 CONFIG_IMX2_WDT=m

 ##
@ -632,17 +622,26 @@ CONFIG_SND_SOC_IMX_MC13783=m
 ## file: sound/soc/omap/Kconfig
 ##
 CONFIG_SND_OMAP_SOC=m
-CONFIG_SND_OMAP_SOC_HDMI=m
 CONFIG_SND_OMAP_SOC_RX51=m
 CONFIG_SND_OMAP_SOC_AM3517EVM=m
 CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
+CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m
 CONFIG_SND_OMAP_SOC_OMAP_HDMI=m
 CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
-CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m

 ##
 ## file: unknown
 ##
+CONFIG_CPU_FREQ_IMX=m
+CONFIG_DISPLAY_TIMING=y
+CONFIG_GPIO_VT8500=y
+CONFIG_IRAM_ALLOC=y
 CONFIG_LEDS=y
 CONFIG_LEDS_CPU=y
+CONFIG_OF_DISPLAY_TIMING=y
+CONFIG_OF_VIDEOMODE=y
+CONFIG_OMAP_32K_TIMER_HZ=128
+CONFIG_OMAP_MBOX_FWK=y
+CONFIG_USB_GADGET_MUSB_HDRC=y
+CONFIG_VIDEOMODE=y

--- a/debian/config/armhf/config.mx5
+++ b/debian/config/armhf/config.mx5
@ -5,8 +5,6 @@ CONFIG_HIGHMEM=y
 # CONFIG_HIGHPTE is not set
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-#. cpufreq driver for i.MX CPU
-CONFIG_CPU_FREQ_IMX=m
 #. Enable NEON SIMD support
 CONFIG_NEON=y

@ -62,6 +60,10 @@ CONFIG_INPUT_TOUCHSCREEN=y
 ## file: drivers/leds/Kconfig
 ##
 CONFIG_LEDS_GPIO=y
+
+##
+## file: drivers/leds/trigger/Kconfig
+##
 CONFIG_LEDS_TRIGGER_GPIO=y

 ##
@ -146,7 +148,7 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_MXC=y

 ##
-## file: drivers/usb/otg/Kconfig
+## file: drivers/usb/phy/Kconfig
 ##
 CONFIG_USB_ULPI=y

@ -166,3 +168,8 @@ CONFIG_SND_SOC=m
 CONFIG_SND_IMX_SOC=m
 CONFIG_SND_SOC_IMX_SGTL5000=m

+##
+## file: unknown
+##
+CONFIG_CPU_FREQ_IMX=m
+
--- a/debian/config/armhf/config.omap
+++ b/debian/config/armhf/config.omap
@ -1,9 +1,6 @@
 ##
 ## file: arch/arm/Kconfig
 ##
-## choice: ARM system type
-CONFIG_ARCH_OMAP=y
-## end choice
 CONFIG_SMP=y
 CONFIG_SMP_ON_UP=y
 CONFIG_HIGHMEM=y
@ -12,8 +9,8 @@ CONFIG_NEON=y
 ##
 ## file: arch/arm/mach-omap2/Kconfig
 ##
-CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
 # CONFIG_ARCH_OMAP2 is not set
+CONFIG_ARCH_OMAP2PLUS_TYPICAL=y

 ##
 ## file: arch/arm/mm/Kconfig
@ -23,19 +20,13 @@ CONFIG_ARM_THUMBEE=y
 ##
 ## file: arch/arm/plat-omap/Kconfig
 ##
-## choice: OMAP System Type
-CONFIG_ARCH_OMAP2PLUS=y
-## end choice
 CONFIG_OMAP_RESET_CLOCKS=y
 CONFIG_OMAP_MUX=y
 # CONFIG_OMAP_MUX_DEBUG is not set
 CONFIG_OMAP_MUX_WARNINGS=y
-CONFIG_OMAP_MBOX_FWK=y
-CONFIG_OMAP_MBOX_KFIFO_SIZE=256
 # CONFIG_OMAP_MPU_TIMER is not set
 CONFIG_OMAP_32K_TIMER=y
 # CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set
-CONFIG_OMAP_32K_TIMER_HZ=128
 CONFIG_OMAP_DM_TIMER=y
 CONFIG_OMAP_SERIAL_WAKE=y
 ## choice: OMAP PM layer selection
@ -82,6 +73,11 @@ CONFIG_I2C_OMAP=y
 ##
 CONFIG_IIO=m

+##
+## file: drivers/iio/light/Kconfig
+##
+CONFIG_SENSORS_TSL2563=m
+
 ##
 ## file: drivers/input/keyboard/Kconfig
 ##
@ -112,8 +108,17 @@ CONFIG_TOUCHSCREEN_TSC2005=m
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_GPIO=m
 CONFIG_LEDS_LP5523=m
+
+##
+## file: drivers/leds/trigger/Kconfig
+##
 CONFIG_LEDS_TRIGGER_GPIO=m

+##
+## file: drivers/mailbox/Kconfig
+##
+CONFIG_OMAP_MBOX_KFIFO_SIZE=256
+
 ##
 ## file: drivers/media/Kconfig
 ##
@ -213,11 +218,6 @@ CONFIG_SPI_SPIDEV=y
 ##
 CONFIG_LIS3L02DQ=m

-##
-## file: drivers/staging/iio/light/Kconfig
-##
-CONFIG_SENSORS_TSL2563=m
-
 ##
 ## file: drivers/staging/tidspbridge/Kconfig
 ##
@ -234,7 +234,6 @@ CONFIG_USB=y
 ## file: drivers/usb/gadget/Kconfig
 ##
 CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_MUSB_HDRC=y
 ## choice: USB Gadget Drivers
 CONFIG_USB_ETH=m
 CONFIG_USB_ETH_RNDIS=y
@ -259,17 +258,13 @@ CONFIG_USB_MUSB_OMAP2PLUS=y
 CONFIG_USB_INVENTRA_DMA=y
 ## end choice

-##
-## file: drivers/usb/otg/Kconfig
-##
-CONFIG_TWL4030_USB=y
-CONFIG_TWL6030_USB=y
-CONFIG_NOP_USB_XCEIV=y
-
 ##
 ## file: drivers/usb/phy/Kconfig
 ##
+CONFIG_NOP_USB_XCEIV=y
 CONFIG_OMAP_USB2=y
+CONFIG_TWL4030_USB=y
+CONFIG_TWL6030_USB=y

 ##
 ## file: drivers/video/Kconfig
@ -335,4 +330,7 @@ CONFIG_SND_OMAP_SOC_RX51=m
 ##
 CONFIG_LEDS=y
 CONFIG_LEDS_CPU=y
+CONFIG_OMAP_32K_TIMER_HZ=128
+CONFIG_OMAP_MBOX_FWK=y
+CONFIG_USB_GADGET_MUSB_HDRC=y

--- a/debian/config/armhf/config.vexpress
+++ b/debian/config/armhf/config.vexpress
@ -60,7 +60,6 @@ CONFIG_MMC_ARMMMCI=y
 ##
 CONFIG_MTD=m
 CONFIG_MTD_CMDLINE_PARTS=m
-CONFIG_MTD_CHAR=m
 CONFIG_MTD_BLOCK=m

 ##
@ -117,3 +116,8 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 ##
 CONFIG_SND_ARMAACI=m

+##
+## file: unknown
+##
+CONFIG_MTD_CHAR=m
+
--- a/debian/config/config
+++ b/debian/config/config
@ -1,9 +1,3 @@
-##
-## file: arch/Kconfig
-##
-CONFIG_KPROBES=y
-CONFIG_UPROBES=y
-
 ##
 ## file: block/Kconfig
 ##
@ -357,6 +351,11 @@ CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y

+##
+## file: drivers/devfreq/Kconfig
+##
+# CONFIG_PM_DEVFREQ is not set
+
 ##
 ## file: drivers/dma/Kconfig
 ##
@ -364,11 +363,6 @@ CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 CONFIG_ASYNC_TX_DMA=y
 # CONFIG_DMATEST is not set

-##
-## file: drivers/devfreq/Kconfig
-##
-# CONFIG_PM_DEVFREQ is not set
-
 ##
 ## file: drivers/edac/Kconfig
 ##
@ -394,7 +388,7 @@ CONFIG_FIREWIRE_NET=m
 CONFIG_FIREWIRE_NOSY=m

 ##
-## file: drivers/firmware/Kconfig
+## file: drivers/firmware/efi/Kconfig
 ##
 CONFIG_EFI_VARS=m
 CONFIG_EFI_VARS_PSTORE=y
@ -524,7 +518,6 @@ CONFIG_HID_PICOLCD_LCD=y
 CONFIG_HID_PICOLCD_LEDS=y
 CONFIG_HID_PICOLCD_CIR=y
 CONFIG_HID_PRIMAX=m
-CONFIG_HID_PS3REMOTE=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
@ -544,7 +537,6 @@ CONFIG_HID_THRUSTMASTER=m
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_HID_WACOM=m
 CONFIG_HID_WIIMOTE=m
-CONFIG_HID_WIIMOTE_EXT=y
 CONFIG_HID_ZEROPLUS=m
 CONFIG_ZEROPLUS_FF=y
 CONFIG_HID_ZYDACRON=m
@ -661,7 +653,6 @@ CONFIG_I2C_NFORCE2_S4985=m
 # CONFIG_I2C_CBUS_GPIO is not set
 # CONFIG_I2C_EG20T is not set
 # CONFIG_I2C_GPIO is not set
-# CONFIG_I2C_INTEL_MID is not set
 CONFIG_I2C_OCORES=m
 CONFIG_I2C_PCA_PLATFORM=m
 CONFIG_I2C_SIMTEC=m
@ -697,7 +688,6 @@ CONFIG_IIO_BUFFER=y
 #. These will be selected by drivers that need them
 # CONFIG_IIO_BUFFER_CB is not set
 # CONFIG_IIO_KFIFO_BUF is not set
-# CONFIG_IIO_TRIGGERED_BUFFER is not set
 # CONFIG_IIO_TRIGGER is not set

 ##
@ -1117,6 +1107,10 @@ CONFIG_LEDS_INTEL_SS4200=m
 CONFIG_LEDS_LT3593=m
 CONFIG_LEDS_DELL_NETBOOKS=m
 CONFIG_LEDS_MC13783=m
+
+##
+## file: drivers/leds/trigger/Kconfig
+##
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
@ -1133,8 +1127,6 @@ CONFIG_MD_RAID0=m
 CONFIG_MD_RAID1=m
 CONFIG_MD_RAID10=m
 CONFIG_MD_RAID456=m
-#. Experimental
-# CONFIG_MULTICORE_RAID456 is not set
 CONFIG_MD_MULTIPATH=m
 CONFIG_MD_FAULTY=m
 CONFIG_BLK_DEV_DM=m
@ -1263,7 +1255,6 @@ 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
@ -1367,8 +1358,8 @@ CONFIG_DVB_DM1105=m
 ## file: drivers/media/pci/ivtv/Kconfig
 ##
 CONFIG_VIDEO_IVTV=m
-CONFIG_VIDEO_FB_IVTV=m
 CONFIG_VIDEO_IVTV_ALSA=m
+CONFIG_VIDEO_FB_IVTV=m

 ##
 ## file: drivers/media/pci/mantis/Kconfig
@ -1524,7 +1515,6 @@ CONFIG_RC_MAP=m
 ##
 ## file: drivers/media/tuners/Kconfig
 ##
-CONFIG_MEDIA_ATTACH=y
 CONFIG_MEDIA_TUNER_TDA827X=m
 CONFIG_MEDIA_TUNER_TEA5761=y
 CONFIG_MEDIA_TUNER_MT2060=m
@ -1596,7 +1586,6 @@ CONFIG_DVB_USB_TECHNISAT_USB2=m
 ## file: drivers/media/usb/dvb-usb-v2/Kconfig
 ##
 CONFIG_DVB_USB_V2=m
-CONFIG_DVB_USB_CYPRESS_FIRMWARE=m
 CONFIG_DVB_USB_AF9015=m
 CONFIG_DVB_USB_AF9035=m
 CONFIG_DVB_USB_ANYSEE=m
@ -1818,30 +1807,30 @@ CONFIG_I2O_BUS=m
 ##
 ## file: drivers/mfd/Kconfig
 ##
-# CONFIG_MFD_SM501 is not set
-CONFIG_MFD_RTSX_PCI=m
+# CONFIG_MFD_CS5535 is not set
 # CONFIG_HTC_PASIC3 is not set
+CONFIG_LPC_SCH=m
+# CONFIG_EZX_PCAP is not set
+# CONFIG_MFD_PCF50633 is not set
+CONFIG_PCF50633_ADC=m
+CONFIG_PCF50633_GPIO=m
 # CONFIG_UCB1400_CORE is not set
+# CONFIG_MFD_RDC321X is not set
+CONFIG_MFD_RTSX_PCI=m
+# CONFIG_MFD_SM501 is not set
+# CONFIG_ABX500_CORE is not set
+# CONFIG_AB3100_CORE is not set
+CONFIG_AB3100_OTP=m
 # CONFIG_TPS6105X is not set
 # CONFIG_TPS65010 is not set
 # CONFIG_TPS6507X is not set
 # CONFIG_MFD_TPS65912_SPI is not set
+# CONFIG_MFD_VX855 is not set
 # CONFIG_MFD_WM8400 is not set
 # CONFIG_MFD_WM831X_I2C is not set
 # CONFIG_MFD_WM831X_SPI is not set
 # CONFIG_MFD_WM8350_I2C is not set
 # CONFIG_MFD_WM8994 is not set
-# CONFIG_MFD_PCF50633 is not set
-CONFIG_PCF50633_ADC=m
-CONFIG_PCF50633_GPIO=m
-# CONFIG_ABX500_CORE is not set
-# CONFIG_AB3100_CORE is not set
-CONFIG_AB3100_OTP=m
-# CONFIG_EZX_PCAP is not set
-# CONFIG_MFD_CS5535 is not set
-CONFIG_LPC_SCH=m
-# CONFIG_MFD_RDC321X is not set
-# CONFIG_MFD_VX855 is not set

 ##
 ## file: drivers/misc/Kconfig
@ -1984,7 +1973,6 @@ CONFIG_MTD_PLATRAM=m
 ##
 # CONFIG_MTD_NAND_ECC_SMC is not set
 # CONFIG_MTD_NAND_ECC_BCH is not set
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
 # CONFIG_MTD_NAND_DENALI is not set
 CONFIG_MTD_NAND_RICOH=m
 # CONFIG_MTD_NAND_DOCG4 is not set
@ -2002,7 +1990,6 @@ CONFIG_MTD_ONENAND_VERIFY_WRITE=y
 # CONFIG_MTD_ONENAND_GENERIC is not set
 # CONFIG_MTD_ONENAND_OTP is not set
 CONFIG_MTD_ONENAND_2X_PROGRAM=y
-CONFIG_MTD_ONENAND_SIM=m

 ##
 ## file: drivers/mtd/ubi/Kconfig
@ -2019,7 +2006,6 @@ CONFIG_NET_CORE=y
 CONFIG_BONDING=m
 CONFIG_DUMMY=m
 CONFIG_EQUALIZER=m
-CONFIG_MII=m
 CONFIG_IFB=m
 CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
@ -2042,7 +2028,6 @@ CONFIG_DEV_APPLETALK=y
 CONFIG_LTPC=m
 CONFIG_IPDDP=m
 CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y

 ##
 ## file: drivers/net/can/Kconfig
@ -2242,8 +2227,8 @@ CONFIG_NET_VENDOR_INTEL=y
 CONFIG_E1000=m
 CONFIG_E1000E=m
 CONFIG_IGB=m
-CONFIG_IGB_DCA=y
 CONFIG_IGB_HWMON=y
+CONFIG_IGB_DCA=y
 CONFIG_IGBVF=m
 CONFIG_IXGB=m
 CONFIG_IXGBE=m
@ -2276,7 +2261,7 @@ CONFIG_MLX4_EN_DCB=y
 CONFIG_MLX4_DEBUG=y

 ##
-## file: drivers/net/ethernet/mellanox/mlx5/Kconfig
+## file: drivers/net/ethernet/mellanox/mlx5/core/Kconfig
 ##
 CONFIG_MLX5_DEBUG=y

@ -2344,11 +2329,6 @@ CONFIG_QLCNIC_SRIOV=y
 CONFIG_QLGE=m
 CONFIG_NETXEN_NIC=m

-##
-## file: drivers/net/ethernet/racal/Kconfig
-##
-CONFIG_NET_VENDOR_RACAL=y
-
 ##
 ## file: drivers/net/ethernet/rdc/Kconfig
 ##
@ -2362,7 +2342,7 @@ CONFIG_NET_VENDOR_REALTEK=y
 CONFIG_R8169=m

 ##
-## file: drivers/net/ethernet/realtek/Kconfig
+## file: drivers/net/ethernet/renesas/Kconfig
 ##
 # CONFIG_SH_ETH is not set

@ -2541,9 +2521,9 @@ CONFIG_SLIP_MODE_SLIP6=y
 CONFIG_NET_TEAM=m
 CONFIG_NET_TEAM_MODE_BROADCAST=m
 CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_RANDOM=m
 CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
 CONFIG_NET_TEAM_MODE_LOADBALANCE=m
-CONFIG_NET_TEAM_MODE_RANDOM=m

 ##
 ## file: drivers/net/usb/Kconfig
@ -2686,7 +2666,6 @@ CONFIG_WIL6210_ISR_COR=y
 ##
 CONFIG_B43=m
 CONFIG_B43_BCMA=y
-# CONFIG_B43_BCMA_EXTRA is not set
 CONFIG_B43_PCMCIA=y
 CONFIG_B43_SDIO=y
 CONFIG_B43_PHY_N=y
@ -2710,8 +2689,8 @@ CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
 ##
 CONFIG_BRCMSMAC=m
 # CONFIG_BRCMFMAC is not set
-# CONFIG_BRCMDBG is not set
 # CONFIG_BRCM_TRACING is not set
+# CONFIG_BRCMDBG is not set

 ##
 ## file: drivers/net/wireless/hostap/Kconfig
@ -3486,7 +3465,6 @@ CONFIG_USB_TMC=m
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_DEFAULT_PERSIST=y
 CONFIG_USB_DYNAMIC_MINORS=y
-CONFIG_USB_SUSPEND=y
 # CONFIG_USB_OTG is not set

 ##
@ -3567,15 +3545,11 @@ CONFIG_USB_MON=y
 ##
 # CONFIG_USB_MUSB_HDRC is not set

-##
-## file: drivers/usb/otg/Kconfig
-##
-CONFIG_NOP_USB_XCEIV=m
-
 ##
 ## file: drivers/usb/phy/Kconfig
 ##
 # CONFIG_USB_PHY is not set
+CONFIG_NOP_USB_XCEIV=m

 ##
 ## file: drivers/usb/renesas_usbhs/Kconfig
@ -4328,8 +4302,8 @@ CONFIG_SQUASHFS_XATTR=y
 CONFIG_SQUASHFS_ZLIB=y
 CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XZ=y
-# CONFIG_SQUASHFS_EMBEDDED is not set
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
+# CONFIG_SQUASHFS_EMBEDDED is not set

 ##
 ## file: fs/sysv/Kconfig
@ -4369,7 +4343,6 @@ CONFIG_XFS_RT=y
 ##
 ## file: init/Kconfig
 ##
-CONFIG_EXPERIMENTAL=y
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 ## choice: Kernel compression mode
@ -4548,17 +4521,31 @@ CONFIG_LIBCRC32C=m
 ##
 CONFIG_PRINTK_TIME=y
 CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
+CONFIG_BOOT_PRINTK_DELAY=y
+# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_INFO_REDUCED is not set
 CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_ENABLE_MUST_CHECK=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_MAGIC_SYSRQ_DEFAULT_MASK=0x01b6
 CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_READABLE_ASM is not set
 CONFIG_UNUSED_SYMBOLS=y
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_MAGIC_SYSRQ_DEFAULT_MASK=0x01b6
 CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_VIRTUAL is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_HIGHMEM is not set
 CONFIG_LOCKUP_DETECTOR=y
 # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
@ -4569,11 +4556,6 @@ CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 CONFIG_TIMER_STATS=y
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_DEBUG_SLAB is not set
-# CONFIG_SLUB_DEBUG_ON is not set
-# CONFIG_SLUB_STATS is not set
-# CONFIG_DEBUG_KMEMLEAK is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
@ -4581,47 +4563,38 @@ CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
 # CONFIG_DEBUG_LOCK_ALLOC is not set
 # CONFIG_PROVE_LOCKING is not set
-# CONFIG_SPARSE_RCU_POINTER is not set
 # CONFIG_LOCK_STAT is not set
 # CONFIG_DEBUG_ATOMIC_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_HIGHMEM is not set
 CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_INFO_REDUCED is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_VIRTUAL is not set
 # CONFIG_DEBUG_WRITECOUNT is not set
-CONFIG_DEBUG_MEMORY_INIT=y
 # CONFIG_DEBUG_LIST is not set
-# CONFIG_TEST_LIST_SORT is not set
 # CONFIG_DEBUG_SG is not set
 # CONFIG_DEBUG_NOTIFIERS is not set
 # CONFIG_DEBUG_CREDENTIALS is not set
-CONFIG_BOOT_PRINTK_DELAY=y
+# CONFIG_SPARSE_RCU_POINTER is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_RCU_CPU_STALL_INFO is not set
 # CONFIG_RCU_TRACE is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
+# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_LATENCYTOP is not set
+# CONFIG_LKDTM is not set
+# CONFIG_TEST_LIST_SORT is not set
 # CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_RBTREE_TEST is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-# CONFIG_LKDTM is not set
-# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_LATENCYTOP is not set
-# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
-# CONFIG_DYNAMIC_DEBUG is not set
-# CONFIG_DMA_API_DEBUG is not set
 # CONFIG_ATOMIC64_SELFTEST is not set
 #. Self-test
 # 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

 ##
 ## file: lib/Kconfig.kgdb
@ -4881,7 +4854,6 @@ CONFIG_TCP_MD5SIG=y
 ##
 CONFIG_NF_CONNTRACK_IPV4=m
 CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_RPFILTER=m
@ -5146,11 +5118,6 @@ CONFIG_NFC=m
 ##
 # CONFIG_NFC_HCI is not set

-##
-## file: net/nfc/llcp/Kconfig
-##
-CONFIG_NFC_LLCP=y
-
 ##
 ## file: net/nfc/nci/Kconfig
 ##
@ -5259,7 +5226,6 @@ CONFIG_NET_CLS_IND=y
 ##
 CONFIG_IP_SCTP=m
 CONFIG_NET_SCTPPROBE=m
-# CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set
 CONFIG_SCTP_COOKIE_HMAC_MD5=y
 CONFIG_SCTP_COOKIE_HMAC_SHA1=y
@ -5283,11 +5249,6 @@ CONFIG_TIPC_MEDIA_IB=y
 CONFIG_UNIX=y
 CONFIG_UNIX_DIAG=m

-##
-## file: net/wanrouter/Kconfig
-##
-# CONFIG_WAN_ROUTER is not set
-
 ##
 ## file: net/wimax/Kconfig
 ##
@ -5529,15 +5490,33 @@ CONFIG_RD_LZO=y
 ##
 ## file: unknown
 ##
+# CONFIG_B43_BCMA_EXTRA is not set
+CONFIG_DVB_USB_CYPRESS_FIRMWARE=m
+CONFIG_EXPERIMENTAL=y
 CONFIG_EXT4_FS_XATTR=y
+CONFIG_HID_PS3REMOTE=m
+CONFIG_HID_WIIMOTE_EXT=y
+# CONFIG_I2C_INTEL_MID is not set
+CONFIG_IPDDP_DECAP=y
+CONFIG_IP_NF_QUEUE=m
+CONFIG_KPROBES=y
 CONFIG_LEDS_ALIX2=m
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
+CONFIG_MTD_ONENAND_SIM=m
 CONFIG_MTD_UBI_BEB_RESERVE=1
+# CONFIG_MULTICORE_RAID456 is not set
+CONFIG_NET_VENDOR_RACAL=y
+CONFIG_NFC_LLCP=y
+# CONFIG_SCTP_DBG_MSG is not set
 CONFIG_SCTP_HMAC_MD5=y
 # CONFIG_SCTP_HMAC_NONE is not set
 # CONFIG_SCTP_HMAC_SHA1 is not set
 # CONFIG_SERIAL_MAX3107 is not set
 CONFIG_SND_HDA_POWER_SAVE=y
 CONFIG_TIPC_ADVANCED=y
+CONFIG_UPROBES=y
 CONFIG_USB_EZUSB=y
 # CONFIG_USB_LIBUSUAL is not set
+CONFIG_USB_SUSPEND=y
+# CONFIG_WAN_ROUTER is not set

--- a/debian/config/hppa/config
+++ b/debian/config/hppa/config
@ -251,10 +251,6 @@ CONFIG_B44=m
 ##
 CONFIG_CS89x0=m

-##
-## file: drivers/net/ethernet/dec/Kconfig
-##
-
 ##
 ## file: drivers/net/ethernet/dec/tulip/Kconfig
 ##
@ -308,11 +304,6 @@ CONFIG_NATSEMI=m
 ##
 CONFIG_FORCEDETH=m

-##
-## file: drivers/net/ethernet/racal/Kconfig
-##
-CONFIG_NET_VENDOR_RACAL=y
-
 ##
 ## file: drivers/net/ethernet/realtek/Kconfig
 ##
@ -323,10 +314,6 @@ CONFIG_8139TOO=m
 # CONFIG_8139TOO_8129 is not set
 # CONFIG_8139_OLD_RX_RESET is not set

-##
-## file: drivers/net/ethernet/seeq/Kconfig
-##
-
 ##
 ## file: drivers/net/ethernet/sis/Kconfig
 ##
@ -582,9 +569,6 @@ CONFIG_DUMMY_CONSOLE_COLUMNS=160
 CONFIG_DUMMY_CONSOLE_ROWS=64
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_STI_CONSOLE=y
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y

 ##
 ## file: drivers/w1/Kconfig
@ -601,6 +585,13 @@ CONFIG_ROOT_NFS=y
 ##
 # CONFIG_LOCKUP_DETECTOR is not set

+##
+## file: lib/fonts/Kconfig
+##
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+
 ##
 ## file: mm/Kconfig
 ##
@ -744,4 +735,5 @@ CONFIG_SND_HARMONY=m
 ## file: unknown
 ##
 # CONFIG_BLK_DEV_UB is not set
+CONFIG_NET_VENDOR_RACAL=y

--- a/debian/config/hppa/config.parisc
+++ b/debian/config/hppa/config.parisc
@ -8,10 +8,6 @@ CONFIG_PA7000=y
 # CONFIG_SMP is not set
 # CONFIG_HPUX is not set

-##
-## file: drivers/net/ethernet/racal/Kconfig
-##
-
 ##
 ## file: drivers/net/ethernet/ti/Kconfig
 ##
--- a/debian/config/hppa/config.parisc64
+++ b/debian/config/hppa/config.parisc64
@ -8,10 +8,6 @@ CONFIG_PA8X00=y
 CONFIG_64BIT=y
 # CONFIG_SMP is not set

-##
-## file: drivers/net/ethernet/racal/Kconfig
-##
-
 ##
 ## file: mm/Kconfig
 ##
--- a/debian/config/i386/config.486
+++ b/debian/config/i386/config.486
@ -70,11 +70,6 @@ CONFIG_NET_VENDOR_I825XX=y
 ##
 CONFIG_NET_VENDOR_NATSEMI=y

-##
-## file: drivers/net/ethernet/racal/Kconfig
-##
-CONFIG_NET_VENDOR_RACAL=y
-
 ##
 ## file: drivers/net/hamradio/Kconfig
 ##
@ -124,3 +119,8 @@ CONFIG_FB_GEODE_GX1=m
 ##
 # CONFIG_TRANSPARENT_HUGEPAGE is not set

+##
+## file: unknown
+##
+CONFIG_NET_VENDOR_RACAL=y
+
--- a/debian/config/i386/config.686-pae
+++ b/debian/config/i386/config.686-pae
@ -32,10 +32,6 @@ CONFIG_I2C_STUB=m
 ##
 # CONFIG_I2C_ELEKTOR is not set

-##
-## file: drivers/net/ethernet/racal/Kconfig
-##
-
 ##
 ## file: drivers/net/hamradio/Kconfig
 ##
--- a/debian/config/ia64/config
+++ b/debian/config/ia64/config
@ -36,11 +36,6 @@ CONFIG_IA64_PRINT_HAZARDS=y
 # CONFIG_HP_SIMSERIAL is not set
 # CONFIG_HP_SIMSCSI is not set

-##
-## file: arch/ia64/kernel/cpufreq/Kconfig
-##
-CONFIG_IA64_ACPI_CPUFREQ=m
-
 ##
 ## file: block/partitions/Kconfig
 ##
@ -114,7 +109,6 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
 ##
 ## file: drivers/char/Kconfig
 ##
-CONFIG_STALDRV=y
 CONFIG_SGI_SNSC=y
 CONFIG_SGI_TIOCX=y
 CONFIG_SGI_MBCS=m
@ -151,12 +145,21 @@ CONFIG_IPMI_SI=m
 CONFIG_IPMI_WATCHDOG=m
 CONFIG_IPMI_POWEROFF=m

+##
+## file: drivers/cpufreq/Kconfig
+##
+CONFIG_IA64_ACPI_CPUFREQ=m
+
 ##
 ## file: drivers/firmware/Kconfig
 ##
-CONFIG_EFI_VARS=y
 CONFIG_DMIID=y

+##
+## file: drivers/firmware/efi/Kconfig
+##
+CONFIG_EFI_VARS=y
+
 ##
 ## file: drivers/gpu/drm/Kconfig
 ##
@ -167,13 +170,17 @@ CONFIG_DRM_RADEON=m
 CONFIG_DRM_MGA=m
 CONFIG_DRM_SIS=m

+##
+## file: drivers/gpu/drm/i2c/Kconfig
+##
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+
 ##
 ## file: drivers/gpu/drm/nouveau/Kconfig
 ##
 CONFIG_DRM_NOUVEAU=m
 # CONFIG_DRM_NOUVEAU_BACKLIGHT is not set
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_DRM_I2C_SIL164=m

 ##
 ## file: drivers/hid/usbhid/Kconfig
@ -661,12 +668,6 @@ CONFIG_PCMCIA_SYM53C500=m
 ##
 CONFIG_SGI_IOC3=m

-##
-## file: drivers/staging/net/Kconfig
-##
-CONFIG_PC300=m
-CONFIG_PC300_MLPPP=y
-
 ##
 ## file: drivers/staging/wlan-ng/Kconfig
 ##
@ -766,6 +767,10 @@ CONFIG_FB_TRIDENT=m
 ##
 CONFIG_VGA_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
+
+##
+## file: lib/fonts/Kconfig
+##
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
@ -871,4 +876,7 @@ CONFIG_SND_HDA_INTEL=m
 ## file: unknown
 ##
 # CONFIG_DRM_NOUVEAU_DEBUG is not set
+CONFIG_PC300=m
+CONFIG_PC300_MLPPP=y
+CONFIG_STALDRV=y

--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@ -11,7 +11,6 @@ CONFIG_X86_MPPARSE=y
 # CONFIG_X86_EXTENDED_PLATFORM is not set
 # CONFIG_X86_INTEL_LPSS is not set
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_PARAVIRT_GUEST=y
 CONFIG_HYPERVISOR_GUEST=y
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_DEBUG is not set
@ -32,7 +31,6 @@ CONFIG_I8K=m
 CONFIG_MICROCODE=m
 CONFIG_MICROCODE_INTEL=y
 CONFIG_MICROCODE_AMD=y
-CONFIG_MICROCODE_INTEL_EARLY=y
 CONFIG_X86_MSR=m
 CONFIG_X86_CPUID=m
 CONFIG_NODES_SHIFT=6
@ -68,7 +66,6 @@ CONFIG_IA32_AOUT=y
 CONFIG_STRICT_DEVMEM=y
 CONFIG_X86_VERBOSE_BOOTUP=y
 # CONFIG_EARLY_PRINTK_DBGP is not set
-# CONFIG_DEBUG_STACKOVERFLOW is not set
 # CONFIG_X86_PTDUMP is not set
 CONFIG_DEBUG_RODATA=y
 # CONFIG_DEBUG_RODATA_TEST is not set
@ -89,7 +86,6 @@ CONFIG_IO_DELAY_0X80=y
 CONFIG_OPTIMIZE_INLINING=y
 # CONFIG_DEBUG_NMI_SELFTEST is not set
 # CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
-# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set

 ##
 ## file: arch/x86/kvm/Kconfig
@ -264,7 +260,6 @@ CONFIG_BT_HCIVHCI=m
 ##
 ## file: drivers/char/Kconfig
 ##
-CONFIG_STALDRV=y
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_PPDEV=m
@ -431,6 +426,12 @@ CONFIG_DRM_GMA600=y
 CONFIG_DRM_GMA3600=y
 CONFIG_DRM_MEDFIELD=y

+##
+## file: drivers/gpu/drm/i2c/Kconfig
+##
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+
 ##
 ## file: drivers/gpu/drm/mgag200/Kconfig
 ##
@ -441,19 +442,12 @@ CONFIG_DRM_MGAG200=m
 ##
 CONFIG_DRM_NOUVEAU=m
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_DRM_I2C_SIL164=m

 ##
 ## file: drivers/gpu/drm/vmwgfx/Kconfig
 ##
 CONFIG_DRM_VMWGFX=m

-##
-## file: drivers/gpu/stub/Kconfig
-##
-# CONFIG_STUB_POULSBO is not set
-
 ##
 ## file: drivers/gpu/vga/Kconfig
 ##
@ -752,7 +746,6 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
 # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
 # CONFIG_MTD_CMDLINE_PARTS is not set
-CONFIG_MTD_CHAR=m
 CONFIG_MTD_BLOCK=m
 CONFIG_MTD_BLOCK_RO=m
 CONFIG_FTL=m
@ -795,9 +788,6 @@ CONFIG_MTD_MTDRAM=m
 CONFIG_MTDRAM_TOTAL_SIZE=4096
 CONFIG_MTDRAM_ERASE_SIZE=128
 CONFIG_MTD_BLOCK2MTD=m
-CONFIG_MTD_DOC2000=m
-CONFIG_MTD_DOC2001=m
-CONFIG_MTD_DOC2001PLUS=m
 # CONFIG_MTD_DOCPROBE_ADVANCED is not set
 CONFIG_MTD_DOCPROBE_ADDRESS=0

@ -818,8 +808,6 @@ CONFIG_MTD_SBC_GXX=m
 # CONFIG_MTD_ICHXROM is not set
 # CONFIG_MTD_SCB2_FLASH is not set
 CONFIG_MTD_NETtel=m
-CONFIG_MTD_DILNETPC=m
-CONFIG_MTD_DILNETPC_BOOTSIZE=0x80000
 # CONFIG_MTD_L440GX is not set
 CONFIG_MTD_PCI=m

@ -1253,6 +1241,7 @@ CONFIG_COMEDI_PARPORT=m
 CONFIG_COMEDI_SERIAL2002=m
 # CONFIG_COMEDI_SKEL is not set
 # CONFIG_COMEDI_ISA_DRIVERS is not set
+CONFIG_COMEDI_S526=m
 CONFIG_COMEDI_PCI_DRIVERS=y
 CONFIG_COMEDI_8255_PCI=m
 CONFIG_COMEDI_ADDI_APCI_035=m
@ -1306,7 +1295,6 @@ CONFIG_COMEDI_NI_LABPC_PCI=m
 CONFIG_COMEDI_NI_PCIDIO=m
 CONFIG_COMEDI_NI_PCIMIO=m
 CONFIG_COMEDI_RTD520=m
-CONFIG_COMEDI_S526=m
 CONFIG_COMEDI_S626=m
 CONFIG_COMEDI_SSV_DNP=m
 CONFIG_COMEDI_PCMCIA_DRIVERS=y
@ -1334,7 +1322,6 @@ CONFIG_ET131X=m
 ## file: drivers/staging/line6/Kconfig
 ##
 CONFIG_LINE6_USB=m
-# CONFIG_LINE6_USB_DUMP_PCM is not set
 # CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set

 ##
@ -1360,12 +1347,6 @@ CONFIG_LIRC_SERIAL_TRANSMITTER=y
 CONFIG_LIRC_SIR=m
 CONFIG_LIRC_ZILOG=m

-##
-## file: drivers/staging/net/Kconfig
-##
-CONFIG_PC300=m
-CONFIG_PC300_MLPPP=y
-
 ##
 ## file: drivers/staging/rtl8187se/Kconfig
 ##
@ -1557,9 +1538,6 @@ CONFIG_FB_HYPERV=m
 ##
 CONFIG_VGA_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y

 ##
 ## file: drivers/video/geode/Kconfig
@ -1636,12 +1614,21 @@ CONFIG_SPARSE_IRQ=y
 ##
 ## file: lib/Kconfig.debug
 ##
-# CONFIG_DEBUG_SHIRQ is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_FRAME_POINTER is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_SHIRQ is not set
+# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set

+##
+## file: lib/fonts/Kconfig
+##
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+
 ##
 ## file: mm/Kconfig
 ##
@ -1782,7 +1769,18 @@ CONFIG_BACKLIGHT_PROGEAR=m
 CONFIG_EASYCAP=m
 CONFIG_HOTPLUG_PCI_FAKE=m
 CONFIG_KVM_CLOCK=y
+# CONFIG_LINE6_USB_DUMP_PCM is not set
 CONFIG_LIRC_TTUSBIR=m
+CONFIG_MTD_CHAR=m
+CONFIG_MTD_DILNETPC=m
+CONFIG_MTD_DILNETPC_BOOTSIZE=0x80000
+CONFIG_MTD_DOC2000=m
+CONFIG_MTD_DOC2001=m
+CONFIG_MTD_DOC2001PLUS=m
 # CONFIG_MTD_NAND_VERIFY_WRITE is not set
-
+CONFIG_PARAVIRT_GUEST=y
+CONFIG_PC300=m
+CONFIG_PC300_MLPPP=y
+CONFIG_STALDRV=y
+# CONFIG_STUB_POULSBO is not set

--- a/debian/config/kernelarch-x86/config-arch-32
+++ b/debian/config/kernelarch-x86/config-arch-32
@ -374,17 +374,14 @@ CONFIG_PCMCIA_NINJA_SCSI=m
 ## file: drivers/staging/comedi/Kconfig
 ##
 CONFIG_COMEDI_ISA_DRIVERS=y
-CONFIG_COMEDI_ACL7225B=m
 CONFIG_COMEDI_PCL711=m
 CONFIG_COMEDI_PCL724=m
-CONFIG_COMEDI_PCL725=m
 CONFIG_COMEDI_PCL726=m
 CONFIG_COMEDI_PCL730=m
 CONFIG_COMEDI_PCL812=m
 CONFIG_COMEDI_PCL816=m
 CONFIG_COMEDI_PCL818=m
 CONFIG_COMEDI_PCM3724=m
-CONFIG_COMEDI_PCM3730=m
 CONFIG_COMEDI_RTI800=m
 CONFIG_COMEDI_RTI802=m
 CONFIG_COMEDI_DAS16M1=m
@ -529,3 +526,10 @@ CONFIG_SND_MSND_CLASSIC=m
 ##
 CONFIG_SND_SIS7019=m

+##
+## file: unknown
+##
+CONFIG_COMEDI_ACL7225B=m
+CONFIG_COMEDI_PCL725=m
+CONFIG_COMEDI_PCM3730=m
+
--- a/debian/config/m68k/config
+++ b/debian/config/m68k/config
@ -1,3 +1,8 @@
+##
+## file: arch/m68k/Kconfig
+##
+# CONFIG_PM is not set
+
 ##
 ## file: arch/m68k/Kconfig.bus
 ##
@ -72,8 +77,8 @@ CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_LDM_PARTITION=y
 CONFIG_LDM_DEBUG=y
 CONFIG_SUN_PARTITION=y
-CONFIG_SYSV68_PARTITION=y
 # CONFIG_KARMA_PARTITION is not set
+CONFIG_SYSV68_PARTITION=y

 ##
 ## file: drivers/accessibility/Kconfig
@ -201,8 +206,6 @@ CONFIG_INPUT_JOYSTICK=y
 # CONFIG_JOYSTICK_INTERACT is not set
 # CONFIG_JOYSTICK_SIDEWINDER is not set
 # CONFIG_JOYSTICK_TMDC is not set
-# CONFIG_JOYSTICK_IFORCE is not set
-# CONFIG_JOYSTICK_IFORCE_232 is not set
 # CONFIG_JOYSTICK_WARRIOR is not set
 # CONFIG_JOYSTICK_MAGELLAN is not set
 # CONFIG_JOYSTICK_SPACEORB is not set
@ -216,6 +219,12 @@ CONFIG_JOYSTICK_DB9=m
 CONFIG_JOYSTICK_AMIGA=m
 # CONFIG_JOYSTICK_JOYDUMP is not set

+##
+## file: drivers/input/joystick/iforce/Kconfig
+##
+# CONFIG_JOYSTICK_IFORCE is not set
+# CONFIG_JOYSTICK_IFORCE_232 is not set
+
 ##
 ## file: drivers/input/keyboard/Kconfig
 ##
@ -368,9 +377,9 @@ CONFIG_DEV_APPLETALK=m
 ##
 ## file: drivers/net/ethernet/8390/Kconfig
 ##
-CONFIG_NE2000=m
 CONFIG_HYDRA=m
 CONFIG_MAC8390=y
+CONFIG_NE2000=m
 CONFIG_APNE=m
 CONFIG_ZORRO8390=m

@ -485,7 +494,6 @@ CONFIG_SCSI_SPI_ATTRS=m
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_AHA152X is not set
 # CONFIG_SCSI_ADVANSYS is not set
-# CONFIG_SCSI_UFSHCD is not set
 # CONFIG_LIBFC is not set
 CONFIG_A3000_SCSI=m
 CONFIG_A2091_SCSI=m
@ -499,6 +507,11 @@ CONFIG_MVME147_SCSI=y
 CONFIG_MVME16x_SCSI=m
 CONFIG_BVME6000_SCSI=m

+##
+## file: drivers/scsi/ufs/Kconfig
+##
+# CONFIG_SCSI_UFSHCD is not set
+
 ##
 ## file: drivers/spi/Kconfig
 ##
@ -554,11 +567,11 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_FB=y
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FB_FOREIGN_ENDIAN=y
+## choice: Choice endianness support
 CONFIG_FB_BOTH_ENDIAN=y
+## end choice
 # CONFIG_FB_MODE_HELPERS is not set
 # CONFIG_FB_TILEBLITTING is not set
-CONFIG_FB_APOLLO=y
-CONFIG_FB_Q40=y
 CONFIG_FB_CIRRUS=y
 CONFIG_FB_PM2=m
 CONFIG_FB_AMIGA=y
@ -573,8 +586,8 @@ CONFIG_FB_MAC=y
 # CONFIG_FB_S1D13XXX is not set
 CONFIG_FB_ATY=y
 # CONFIG_FB_ATY_BACKLIGHT is not set
-# CONFIG_FB_METRONOME is not set
 # CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set

 ##
 ## file: drivers/video/backlight/Kconfig
@ -585,11 +598,6 @@ CONFIG_FB_ATY=y
 ## file: drivers/video/console/Kconfig
 ##
 CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-CONFIG_FONT_6x11=y
-CONFIG_FONT_PEARL_8x8=y

 ##
 ## file: drivers/video/logo/Kconfig
@ -611,13 +619,6 @@ CONFIG_FONT_PEARL_8x8=y
 ##
 CONFIG_ZORRO_NAMES=y

-##
-## file: fs/Kconfig.binfmt
-##
-CONFIG_BINFMT_ELF=y
-CONFIG_BINFMT_AOUT=m
-CONFIG_BINFMT_MISC=m
-
 ##
 ## file: fs/adfs/Kconfig
 ##
@ -628,6 +629,11 @@ CONFIG_BINFMT_MISC=m
 ##
 # CONFIG_AFS_FS is not set

+##
+## file: fs/aufs/Kconfig
+##
+CONFIG_AUFS_BR_FUSE=y
+
 ##
 ## file: fs/befs/Kconfig
 ##
@ -638,6 +644,13 @@ CONFIG_BINFMT_MISC=m
 ##
 # CONFIG_BFS_FS is not set

+##
+## file: fs/Kconfig.binfmt
+##
+CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_AOUT=m
+CONFIG_BINFMT_MISC=m
+
 ##
 ## file: fs/ceph/Kconfig
 ##
@ -683,26 +696,11 @@ CONFIG_BINFMT_MISC=m
 ##
 # CONFIG_VXFS_FS is not set

-##
-## file: fs/fuse/Kconfig
-##
-CONFIG_AUFS_BR_FUSE=y
-
 ##
 ## file: fs/gfs2/Kconfig
 ##
 # CONFIG_GFS2_FS is not set

-##
-## file: fs/jbd/Kconfig
-##
-CONFIG_JBD=m
-
-##
-## file: fs/jbd2/Kconfig
-##
-CONFIG_JBD2=m
-
 ##
 ## file: fs/jfs/Kconfig
 ##
@ -763,33 +761,42 @@ CONFIG_HZ_100=y
 # CONFIG_HZ_250 is not set
 # CONFIG_HZ_300 is not set
 # CONFIG_HZ_1000 is not set
+## end choice

 ##
 ## file: kernel/power/Kconfig
 ##
 # CONFIG_SUSPEND is not set
 # CONFIG_HIBERNATION is not set
-# CONFIG_PM_SLEEP is not set
 # CONFIG_PM_RUNTIME is not set
-# CONFIG_PM is not set
-# CONFIG_PM_TRACE is not set

 ##
 ## file: kernel/time/Kconfig
 ##
+## choice: Timer tick handling
 CONFIG_HZ_PERIODIC=y
-# CONFIG_NO_HZ is not set
 # CONFIG_NO_HZ_IDLE is not set
 # CONFIG_NO_HZ_FULL is not set
+## end choice
+# CONFIG_NO_HZ is not set
 # CONFIG_HIGH_RES_TIMERS is not set

 ##
 ## file: lib/Kconfig.debug
 ##
 # CONFIG_DEBUG_FS is not set
+# CONFIG_FRAME_POINTER is not set
 # CONFIG_SCHED_DEBUG is not set
 # CONFIG_TIMER_STATS is not set
-# CONFIG_FRAME_POINTER is not set
+
+##
+## file: lib/fonts/Kconfig
+##
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+CONFIG_FONT_6x11=y
+CONFIG_FONT_PEARL_8x8=y

 ##
 ## file: lib/xz/Kconfig
@ -952,3 +959,4 @@ CONFIG_IPX=m
 CONFIG_DMASOUND_ATARI=m
 CONFIG_DMASOUND_PAULA=m
 CONFIG_DMASOUND_Q40=m
+
--- a/debian/config/mips/config
+++ b/debian/config/mips/config
@ -7,3 +7,4 @@ CONFIG_CPU_BIG_ENDIAN=y
 ## end choice
 CONFIG_KEXEC=y
 # CONFIG_RAPIDIO is not set
+
--- a/debian/config/mips/config.4kc-malta
+++ b/debian/config/mips/config.4kc-malta
@ -13,8 +13,6 @@ CONFIG_OPROFILE=m
 # CONFIG_LASAT is not set
 CONFIG_MIPS_MALTA=y
 # CONFIG_MACH_VR41XX is not set
-# CONFIG_PNX8550_JBS is not set
-# CONFIG_PNX8550_STB810 is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP32 is not set
@ -27,7 +25,6 @@ CONFIG_MIPS_MALTA=y
 # CONFIG_SIBYTE_SENTOSA is not set
 # CONFIG_SIBYTE_BIGSUR is not set
 # CONFIG_SNI_RM is not set
-# CONFIG_WR_PPMC is not set
 ## end choice
 ## choice: CPU type
 CONFIG_CPU_MIPS32_R1=y
@ -202,13 +199,17 @@ CONFIG_DRM_MGA=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_SAVAGE=m

+##
+## file: drivers/gpu/drm/i2c/Kconfig
+##
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+
 ##
 ## file: drivers/gpu/drm/nouveau/Kconfig
 ##
 CONFIG_DRM_NOUVEAU=m
 # CONFIG_DRM_NOUVEAU_BACKLIGHT is not set
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_DRM_I2C_SIL164=m

 ##
 ## file: drivers/hwmon/Kconfig
@ -447,7 +448,6 @@ CONFIG_MTD_REDBOOT_PARTS=y
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
 # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
-CONFIG_MTD_CHAR=m
 CONFIG_MTD_BLKDEVS=m
 CONFIG_MTD_BLOCK=m
 CONFIG_MTD_BLOCK_RO=m
@ -495,9 +495,6 @@ CONFIG_MTD_MTDRAM=m
 CONFIG_MTDRAM_TOTAL_SIZE=4096
 CONFIG_MTDRAM_ERASE_SIZE=128
 CONFIG_MTD_BLOCK2MTD=m
-CONFIG_MTD_DOC2000=m
-CONFIG_MTD_DOC2001=m
-CONFIG_MTD_DOC2001PLUS=m
 # CONFIG_MTD_DOCPROBE_ADVANCED is not set
 CONFIG_MTD_DOCPROBE_ADDRESS=0

@ -517,7 +514,6 @@ CONFIG_MTD_PLATRAM=m
 ##
 # CONFIG_MTD_NAND_ECC_SMC is not set
 CONFIG_MTD_NAND=m
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
 CONFIG_MTD_NAND_DISKONCHIP=m
 # CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
 CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
@ -988,9 +984,6 @@ CONFIG_FB_VIRTUAL=m
 ##
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y

 ##
 ## file: drivers/watchdog/Kconfig
@ -1016,6 +1009,13 @@ CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_UNUSED_SYMBOLS=y
 # CONFIG_HEADERS_CHECK is not set

+##
+## file: lib/fonts/Kconfig
+##
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+
 ##
 ## file: mm/Kconfig
 ##
@ -1170,7 +1170,15 @@ CONFIG_SND_HDA_INTEL=m
 # CONFIG_CPU_RM9000 is not set
 # CONFIG_DRM_NOUVEAU_DEBUG is not set
 # CONFIG_MIPS_SIM is not set
+CONFIG_MTD_CHAR=m
+CONFIG_MTD_DOC2000=m
+CONFIG_MTD_DOC2001=m
+CONFIG_MTD_DOC2001PLUS=m
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
 # CONFIG_MTD_NAND_VERIFY_WRITE is not set
 CONFIG_MTD_UBI_BEB_RESERVE=1
 # CONFIG_PMC_YOSEMITE is not set
+# CONFIG_PNX8550_JBS is not set
+# CONFIG_PNX8550_STB810 is not set
+# CONFIG_WR_PPMC is not set

--- a/debian/config/mips/config.5kc-malta
+++ b/debian/config/mips/config.5kc-malta
@ -13,8 +13,6 @@ CONFIG_OPROFILE=m
 # CONFIG_LASAT is not set
 CONFIG_MIPS_MALTA=y
 # CONFIG_MACH_VR41XX is not set
-# CONFIG_PNX8550_JBS is not set
-# CONFIG_PNX8550_STB810 is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP32 is not set
@ -27,7 +25,6 @@ CONFIG_MIPS_MALTA=y
 # CONFIG_SIBYTE_SENTOSA is not set
 # CONFIG_SIBYTE_BIGSUR is not set
 # CONFIG_SNI_RM is not set
-# CONFIG_WR_PPMC is not set
 ## end choice
 ## choice: CPU type
 # CONFIG_CPU_MIPS32_R1 is not set
@ -205,13 +202,17 @@ CONFIG_DRM_MGA=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_SAVAGE=m

+##
+## file: drivers/gpu/drm/i2c/Kconfig
+##
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+
 ##
 ## file: drivers/gpu/drm/nouveau/Kconfig
 ##
 CONFIG_DRM_NOUVEAU=m
 # CONFIG_DRM_NOUVEAU_BACKLIGHT is not set
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_DRM_I2C_SIL164=m

 ##
 ## file: drivers/hwmon/Kconfig
@ -451,7 +452,6 @@ CONFIG_MTD_REDBOOT_PARTS=y
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
 # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
-CONFIG_MTD_CHAR=m
 CONFIG_MTD_BLKDEVS=m
 CONFIG_MTD_BLOCK=m
 CONFIG_MTD_BLOCK_RO=m
@ -499,9 +499,6 @@ CONFIG_MTD_MTDRAM=m
 CONFIG_MTDRAM_TOTAL_SIZE=4096
 CONFIG_MTDRAM_ERASE_SIZE=128
 CONFIG_MTD_BLOCK2MTD=m
-CONFIG_MTD_DOC2000=m
-CONFIG_MTD_DOC2001=m
-CONFIG_MTD_DOC2001PLUS=m
 # CONFIG_MTD_DOCPROBE_ADVANCED is not set
 CONFIG_MTD_DOCPROBE_ADDRESS=0

@ -521,7 +518,6 @@ CONFIG_MTD_PLATRAM=m
 ##
 # CONFIG_MTD_NAND_ECC_SMC is not set
 CONFIG_MTD_NAND=m
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
 CONFIG_MTD_NAND_DISKONCHIP=m
 # CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
 CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
@ -992,9 +988,6 @@ CONFIG_FB_VIRTUAL=m
 ##
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y

 ##
 ## file: drivers/watchdog/Kconfig
@ -1020,6 +1013,13 @@ CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_UNUSED_SYMBOLS=y
 # CONFIG_HEADERS_CHECK is not set

+##
+## file: lib/fonts/Kconfig
+##
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+
 ##
 ## file: mm/Kconfig
 ##
@ -1174,7 +1174,15 @@ CONFIG_SND_HDA_INTEL=m
 # CONFIG_CPU_RM9000 is not set
 # CONFIG_DRM_NOUVEAU_DEBUG is not set
 # CONFIG_MIPS_SIM is not set
+CONFIG_MTD_CHAR=m
+CONFIG_MTD_DOC2000=m
+CONFIG_MTD_DOC2001=m
+CONFIG_MTD_DOC2001PLUS=m
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
 # CONFIG_MTD_NAND_VERIFY_WRITE is not set
 CONFIG_MTD_UBI_BEB_RESERVE=1
 # CONFIG_PMC_YOSEMITE is not set
+# CONFIG_PNX8550_JBS is not set
+# CONFIG_PNX8550_STB810 is not set
+# CONFIG_WR_PPMC is not set

--- a/debian/config/mips/config.octeon
+++ b/debian/config/mips/config.octeon
@ -1,9 +1,6 @@
 ##
 ## file: arch/mips/Kconfig
 ##
-## choice: System type
-CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD=y
-## end choice
 # CONFIG_HOTPLUG_CPU is not set
 ## choice: Kernel code model
 # CONFIG_32BIT is not set
@ -19,7 +16,6 @@ CONFIG_MIPS32_N32=y
 ## file: arch/mips/cavium-octeon/Kconfig
 ##
 # CONFIG_CAVIUM_OCTEON_2ND_KERNEL is not set
-CONFIG_CAVIUM_OCTEON_HW_FIX_UNALIGNED=y
 CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE=1
 CONFIG_CAVIUM_OCTEON_LOCK_L2=y
 CONFIG_CAVIUM_OCTEON_LOCK_L2_TLB=y
@ -78,7 +74,6 @@ CONFIG_FUSION_SAS=y
 ## file: drivers/mtd/Kconfig
 ##
 CONFIG_MTD=y
-CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLOCK=y

 ##
@ -129,3 +124,10 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=2
 CONFIG_SPARSEMEM_MANUAL=y
 ## end choice

+##
+## file: unknown
+##
+CONFIG_CAVIUM_OCTEON_HW_FIX_UNALIGNED=y
+CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD=y
+CONFIG_MTD_CHAR=y
+
--- a/debian/config/mips/config.r4k-ip22
+++ b/debian/config/mips/config.r4k-ip22
@ -13,7 +13,6 @@
 # CONFIG_LASAT is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MACH_VR41XX is not set
-# CONFIG_PNX8550_JBS is not set
 CONFIG_SGI_IP22=y
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP32 is not set
@ -304,29 +303,16 @@ CONFIG_WD80x3=m
 ##
 # CONFIG_DM9000 is not set

-##
-## file: drivers/net/ethernet/dec/Kconfig
-##
-
 ##
 ## file: drivers/net/ethernet/dec/tulip/Kconfig
 ##
 # CONFIG_NET_TULIP is not set

-##
-## file: drivers/net/ethernet/fujitsu/Kconfig
-##
-
 ##
 ## file: drivers/net/ethernet/hp/Kconfig
 ##
 # CONFIG_HP100 is not set

-##
-## file: drivers/net/ethernet/racal/Kconfig
-##
-# CONFIG_NET_VENDOR_RACAL is not set
-
 ##
 ## file: drivers/net/ethernet/seeq/Kconfig
 ##
@ -425,9 +411,6 @@ CONFIG_FB=y
 CONFIG_SGI_NEWPORT_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y

 ##
 ## file: drivers/w1/Kconfig
@ -447,6 +430,13 @@ CONFIG_INDYDOG=m
 ##
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

+##
+## file: lib/fonts/Kconfig
+##
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+
 ##
 ## file: mm/Kconfig
 ##
@ -510,5 +500,7 @@ CONFIG_SND_SGI_HAL2=m
 # CONFIG_MIPS_PB1500 is not set
 # CONFIG_MIPS_PB1550 is not set
 # CONFIG_MIPS_SIM is not set
+# CONFIG_NET_VENDOR_RACAL is not set
 # CONFIG_PMC_YOSEMITE is not set
+# CONFIG_PNX8550_JBS is not set

--- a/debian/config/mips/config.r5k-ip32
+++ b/debian/config/mips/config.r5k-ip32
@ -13,7 +13,6 @@
 # CONFIG_LASAT is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MACH_VR41XX is not set
-# CONFIG_PNX8550_JBS is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
 CONFIG_SGI_IP32=y
@ -558,9 +557,6 @@ CONFIG_FB_GBE_MEM=4
 ##
 CONFIG_FRAMEBUFFER_CONSOLE=y
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y

 ##
 ## file: drivers/w1/Kconfig
@ -578,6 +574,13 @@ CONFIG_FONT_8x16=y
 ##
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

+##
+## file: lib/fonts/Kconfig
+##
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+
 ##
 ## file: mm/Kconfig
 ##
@ -671,4 +674,5 @@ CONFIG_SND_KORG1212=m
 # CONFIG_MIPS_PB1550 is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_PMC_YOSEMITE is not set
+# CONFIG_PNX8550_JBS is not set

--- a/debian/config/mips/config.sb1-bcm91250a
+++ b/debian/config/mips/config.sb1-bcm91250a
@ -13,7 +13,6 @@
 # CONFIG_LASAT is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MACH_VR41XX is not set
-# CONFIG_PNX8550_JBS is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP32 is not set
@ -703,9 +702,6 @@ CONFIG_FB_TRIDENT=m
 ##
 CONFIG_FRAMEBUFFER_CONSOLE=y
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y

 ##
 ## file: drivers/w1/Kconfig
@ -730,6 +726,13 @@ CONFIG_ROOT_NFS=y
 ##
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

+##
+## file: lib/fonts/Kconfig
+##
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+
 ##
 ## file: mm/Kconfig
 ##
@ -783,4 +786,5 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_MIPS_PB1550 is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_PMC_YOSEMITE is not set
+# CONFIG_PNX8550_JBS is not set

--- a/debian/config/mips/config.sb1a-bcm91480b
+++ b/debian/config/mips/config.sb1a-bcm91480b
@ -13,7 +13,6 @@
 # CONFIG_LASAT is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MACH_VR41XX is not set
-# CONFIG_PNX8550_JBS is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP32 is not set
@ -709,9 +708,6 @@ CONFIG_FB_TRIDENT=m
 ##
 CONFIG_FRAMEBUFFER_CONSOLE=y
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y

 ##
 ## file: drivers/w1/Kconfig
@ -736,6 +732,13 @@ CONFIG_ROOT_NFS=y
 ##
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

+##
+## file: lib/fonts/Kconfig
+##
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+
 ##
 ## file: mm/Kconfig
 ##
@ -789,4 +792,5 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_MIPS_PB1550 is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_PMC_YOSEMITE is not set
+# CONFIG_PNX8550_JBS is not set

--- a/debian/config/mipsel/config
+++ b/debian/config/mipsel/config
@ -5,3 +5,4 @@
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CPU_LITTLE_ENDIAN=y
 ## end choice
+
--- a/debian/config/mipsel/config.loongson-2f
+++ b/debian/config/mipsel/config.loongson-2f
@ -13,11 +13,6 @@ CONFIG_MIPS32_COMPAT=y
 CONFIG_MIPS32_O32=y
 CONFIG_MIPS32_N32=y

-##
-## file: arch/mips/kernel/cpufreq/Kconfig
-##
-CONFIG_LOONGSON2_CPUFREQ=m
-
 ##
 ## file: arch/mips/loongson/Kconfig
 ##
@ -42,6 +37,7 @@ CONFIG_PATA_AMD=y
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
 ## end choice
+CONFIG_LOONGSON2_CPUFREQ=m

 ##
 ## file: drivers/input/touchscreen/Kconfig
--- a/debian/config/mipsel/config.r5k-cobalt
+++ b/debian/config/mipsel/config.r5k-cobalt
@ -8,7 +8,6 @@ CONFIG_MIPS_COBALT=y
 # CONFIG_LASAT is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MACH_VR41XX is not set
-# CONFIG_PNX8550_JBS is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP32 is not set
@ -304,7 +303,6 @@ CONFIG_LEDS_COBALT_RAQ=y
 CONFIG_MTD=y
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_CMDLINE_PARTS is not set
-CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLKDEVS=y
 # CONFIG_MTD_BLOCK is not set
 # CONFIG_MTD_BLOCK_RO is not set
@ -347,9 +345,6 @@ CONFIG_MTD_CFI_AMDSTD=y
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_MTDRAM is not set
 # CONFIG_MTD_BLOCK2MTD is not set
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set

 ##
 ## file: drivers/mtd/maps/Kconfig
@ -794,5 +789,10 @@ CONFIG_SND_HDA_INTEL=m
 # CONFIG_MIPS_PB1500 is not set
 # CONFIG_MIPS_PB1550 is not set
 # CONFIG_MIPS_SIM is not set
+CONFIG_MTD_CHAR=y
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
 # CONFIG_PMC_YOSEMITE is not set
+# CONFIG_PNX8550_JBS is not set

--- a/debian/config/powerpc/config
+++ b/debian/config/powerpc/config
@ -19,7 +19,6 @@ CONFIG_PCI=y
 ## file: arch/powerpc/Kconfig.debug
 ##
 CONFIG_PPC_DISABLE_WERROR=y
-# CONFIG_DEBUG_STACKOVERFLOW is not set
 # CONFIG_CODE_PATCHING_SELFTEST is not set
 # CONFIG_FTR_FIXUP_SELFTEST is not set
 # CONFIG_MSI_BITMAP_SELFTEST is not set
@ -39,7 +38,6 @@ CONFIG_VIRTUALIZATION=y
 ##
 CONFIG_KVM_GUEST=y
 CONFIG_RTAS_PROC=y
-CONFIG_CPU_FREQ_PMAC=y
 CONFIG_PPC601_SYNC_FIX=y
 CONFIG_TAU=y
 # CONFIG_TAU_INT is not set
@ -70,11 +68,6 @@ CONFIG_TAU=y
 ##
 CONFIG_PPC_PMAC=y

-##
-## file: arch/powerpc/platforms/prep/Kconfig
-##
-CONFIG_PREP_RESIDUAL=y
-
 ##
 ## file: block/partitions/Kconfig
 ##
@ -184,6 +177,11 @@ CONFIG_IPMI_SI=m
 CONFIG_IPMI_WATCHDOG=m
 CONFIG_IPMI_POWEROFF=m

+##
+## file: drivers/cpufreq/Kconfig.powerpc
+##
+CONFIG_CPU_FREQ_PMAC=y
+
 ##
 ## file: drivers/gpu/drm/Kconfig
 ##
@ -194,13 +192,17 @@ CONFIG_DRM_RADEON=m
 CONFIG_DRM_MGA=m
 # CONFIG_DRM_SIS is not set

+##
+## file: drivers/gpu/drm/i2c/Kconfig
+##
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+
 ##
 ## file: drivers/gpu/drm/nouveau/Kconfig
 ##
 CONFIG_DRM_NOUVEAU=m
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_DRM_I2C_SIL164=m

 ##
 ## file: drivers/gpu/drm/radeon/Kconfig
@ -752,12 +754,6 @@ CONFIG_PCMCIA_NINJA_SCSI=m
 CONFIG_PCMCIA_QLOGIC=m
 CONFIG_PCMCIA_SYM53C500=m

-##
-## file: drivers/staging/net/Kconfig
-##
-CONFIG_PC300=m
-CONFIG_PC300_MLPPP=y
-
 ##
 ## file: drivers/tty/Kconfig
 ##
@ -857,9 +853,6 @@ CONFIG_FB_IBM_GXT4500=m
 ##
 CONFIG_VGA_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y

 ##
 ## file: drivers/watchdog/Kconfig
@ -873,6 +866,14 @@ CONFIG_USBPCWATCHDOG=m
 ## file: lib/Kconfig.debug
 ##
 # CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+
+##
+## file: lib/fonts/Kconfig
+##
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y

 ##
 ## file: net/ax25/Kconfig
@ -1022,5 +1023,8 @@ CONFIG_SND_POWERMAC_AUTO_DRC=y
 ##
 # CONFIG_BLK_DEV_UB is not set
 # CONFIG_DRM_NOUVEAU_DEBUG is not set
+CONFIG_PC300=m
+CONFIG_PC300_MLPPP=y
+CONFIG_PREP_RESIDUAL=y
 CONFIG_USB_OHCI_HCD_PPC_SOC=y

--- a/debian/config/powerpc/config.powerpc
+++ b/debian/config/powerpc/config.powerpc
@ -37,11 +37,6 @@ CONFIG_PPC_CHRP=y
 CONFIG_ALTIVEC=y
 # CONFIG_SMP is not set

-##
-## file: arch/powerpc/platforms/prep/Kconfig
-##
-# CONFIG_PPC_PREP is not set
-
 ##
 ## file: drivers/ata/Kconfig
 ##
@ -56,6 +51,10 @@ CONFIG_MAC_FLOPPY=y
 ## file: drivers/dma/Kconfig
 ##
 CONFIG_DMADEVICES=y
+
+##
+## file: drivers/dma/bestcomm/Kconfig
+##
 CONFIG_PPC_BESTCOMM=m

 ##
@ -65,11 +64,6 @@ CONFIG_SENSORS_AMS=m
 CONFIG_SENSORS_AMS_PMU=y
 CONFIG_SENSORS_AMS_I2C=y

-##
-## file: drivers/net/Kconfig
-##
-CONFIG_MII=y
-
 ##
 ## file: drivers/net/ethernet/freescale/Kconfig
 ##
@ -105,3 +99,8 @@ CONFIG_FLATMEM_MANUAL=y
 # CONFIG_SPARSEMEM_MANUAL is not set
 ## end choice

+##
+## file: unknown
+##
+# CONFIG_PPC_PREP is not set
+
--- a/debian/config/powerpc/config.powerpc64
+++ b/debian/config/powerpc/config.powerpc64
@ -17,9 +17,6 @@ CONFIG_KERNEL_START=0xc000000000000000
 CONFIG_RTAS_PROC=y
 CONFIG_RTAS_FLASH=m
 CONFIG_IBMEBUS=y
-CONFIG_CPU_FREQ_PMAC64=y
-#. It's a bool
-CONFIG_PPC_PASEMI_CPUFREQ=y

 ##
 ## file: arch/powerpc/platforms/cell/Kconfig
@ -30,7 +27,6 @@ CONFIG_SPU_FS=m
 CONFIG_SPU_FS_64K_LS=y
 CONFIG_CBE_RAS=y
 CONFIG_CBE_THERM=m
-CONFIG_CBE_CPUFREQ=m

 ##
 ## file: arch/powerpc/platforms/Kconfig.cputype
@ -92,6 +88,13 @@ CONFIG_BLK_DEV_RSXX=m
 CONFIG_HW_RANDOM=m
 CONFIG_HW_RANDOM_PASEMI=m

+##
+## file: drivers/cpufreq/Kconfig.powerpc
+##
+CONFIG_CPU_FREQ_PMAC64=y
+#. It's a bool
+CONFIG_PPC_PASEMI_CPUFREQ=y
+
 ##
 ## file: drivers/i2c/busses/Kconfig
 ##
@ -188,13 +191,6 @@ CONFIG_FB_PS3_DEFAULT_SIZE_M=9
 ##
 CONFIG_WATCHDOG_RTAS=m

-##
-## file: init/Kconfig
-##
-## choice: Cputime accounting
-CONFIG_VIRT_CPU_ACCOUNTING=y
-## end choice
-
 ##
 ## file: mm/Kconfig
 ##
@ -211,3 +207,8 @@ CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_SND_PS3=m
 CONFIG_SND_PS3_DEFAULT_START_DELAY=2000

+##
+## file: unknown
+##
+CONFIG_CBE_CPUFREQ=m
+
--- a/debian/config/powerpcspe/config.powerpcspe
+++ b/debian/config/powerpcspe/config.powerpcspe
@ -25,8 +25,3 @@ CONFIG_PPC_85xx=y
 CONFIG_PHYS_64BIT=y
 CONFIG_SMP=y

-##
-## file: drivers/net/Kconfig
-##
-CONFIG_MII=y
-
--- a/debian/config/s390/config
+++ b/debian/config/s390/config
@ -7,7 +7,6 @@ CONFIG_NR_CPUS=32
 CONFIG_HOTPLUG_CPU=y
 CONFIG_MATHEMU=y
 CONFIG_PACK_STACK=y
-# CONFIG_SMALL_STACK is not set
 # CONFIG_CHECK_STACK is not set
 CONFIG_QDIO=y
 # CONFIG_ZFCPDUMP is not set
@ -184,3 +183,8 @@ CONFIG_AFIUCV=m
 ##
 # CONFIG_LLC2 is not set

+##
+## file: unknown
+##
+# CONFIG_SMALL_STACK is not set
+
--- a/debian/config/sh4/config
+++ b/debian/config/sh4/config
@ -1,7 +1,6 @@
 ##
 ## file: arch/sh/Kconfig
 ##
-CONFIG_SH_CPU_FREQ=y
 CONFIG_KEXEC=y
 CONFIG_SECCOMP=y

@ -33,6 +32,7 @@ CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ_STAT_DETAILS=y
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_SH_CPU_FREQ=y

 ##
 ## file: kernel/Kconfig.hz
--- a/debian/config/sh4/config.sh7751r
+++ b/debian/config/sh4/config.sh7751r
@ -76,7 +76,6 @@ CONFIG_MFD_SM501=y
 ## file: drivers/mtd/Kconfig
 ##
 CONFIG_MTD=y
-CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y

@ -100,7 +99,6 @@ CONFIG_MTD_PHYSMAP=y
 ## file: drivers/net/Kconfig
 ##
 CONFIG_NETDEVICES=y
-CONFIG_MII=y

 ##
 ## file: drivers/net/ethernet/realtek/Kconfig
@ -163,8 +161,6 @@ CONFIG_FB_SM501=y
 ## file: drivers/video/console/Kconfig
 ##
 CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y

 ##
 ## file: kernel/time/Kconfig
@ -172,6 +168,12 @@ CONFIG_FONT_8x16=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y

+##
+## file: lib/fonts/Kconfig
+##
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+
 ##
 ## file: mm/Kconfig
 ##
@ -179,3 +181,8 @@ CONFIG_HIGH_RES_TIMERS=y
 CONFIG_FLATMEM_MANUAL=y
 ## end choice

+##
+## file: unknown
+##
+CONFIG_MTD_CHAR=y
+
--- a/debian/config/sh4/config.sh7785lcr
+++ b/debian/config/sh4/config.sh7785lcr
@ -121,7 +121,6 @@ CONFIG_MFD_SM501=y
 ## file: drivers/mtd/Kconfig
 ##
 CONFIG_MTD=y
-CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y

@ -145,7 +144,6 @@ CONFIG_MTD_PHYSMAP=y
 ## file: drivers/net/Kconfig
 ##
 CONFIG_NETDEVICES=y
-CONFIG_MII=y

 ##
 ## file: drivers/net/ethernet/realtek/Kconfig
@ -209,8 +207,6 @@ CONFIG_FB_SM501=y
 ## file: drivers/video/console/Kconfig
 ##
 CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y

 ##
 ## file: drivers/watchdog/Kconfig
@ -225,6 +221,12 @@ CONFIG_SH_WDT=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y

+##
+## file: lib/fonts/Kconfig
+##
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+
 ##
 ## file: mm/Kconfig
 ##
@ -234,3 +236,8 @@ CONFIG_SPARSEMEM_MANUAL=y
 CONFIG_MIGRATION=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096

+##
+## file: unknown
+##
+CONFIG_MTD_CHAR=y
+
--- a/debian/config/sparc/config
+++ b/debian/config/sparc/config
@ -68,13 +68,17 @@ CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_MGA=m

+##
+## file: drivers/gpu/drm/i2c/Kconfig
+##
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+
 ##
 ## file: drivers/gpu/drm/nouveau/Kconfig
 ##
 CONFIG_DRM_NOUVEAU=m
 # CONFIG_DRM_NOUVEAU_BACKLIGHT is not set
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_DRM_I2C_SIL164=m

 ##
 ## file: drivers/hid/usbhid/Kconfig
@ -510,16 +514,20 @@ CONFIG_FB_ATY_GX=y
 ## file: drivers/video/console/Kconfig
 ##
 CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x16=y
-CONFIG_FONT_SUN8x16=y
-# CONFIG_FONT_SUN12x22 is not set

 ##
 ## file: drivers/w1/Kconfig
 ##
 # CONFIG_W1 is not set

+##
+## file: lib/fonts/Kconfig
+##
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x16=y
+CONFIG_FONT_SUN8x16=y
+# CONFIG_FONT_SUN12x22 is not set
+
 ##
 ## file: mm/Kconfig
 ##