7 files changed, 56 insertions, 48 deletions
diff --git a/debian/config/alpha/config b/debian/config/alpha/config
index 30efe59cbea2..0a2e76862912 100644
--- a/debian/config/alpha/config
+++ b/debian/config/alpha/config
@@ -748,11 +748,6 @@ CONFIG_PCI_HERMES=m
 CONFIG_PCMCIA_HERMES=m
 
 ##
-## file: drivers/pci/pcie/Kconfig
-##
-# CONFIG_PCIEPORTBUS is not set
-
-##
 ## file: drivers/pcmcia/Kconfig
 ##
 CONFIG_PCCARD=m
@@ -1114,3 +1109,8 @@ CONFIG_SND_YMFPCI=m
 ##
 CONFIG_SND_HDA_INTEL=m
 
+##
+## file: unknown
+##
+# CONFIG_PCIEPORTBUS is not set
+
diff --git a/debian/config/armel/config.iop32x b/debian/config/armel/config.iop32x
index 323bc2f96858..fb2dc6a4ea36 100644
--- a/debian/config/armel/config.iop32x
+++ b/debian/config/armel/config.iop32x
@@ -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_IOP32X=y
 # CONFIG_ARCH_IOP33X is not set
 # CONFIG_ARCH_IXP4XX is not set
@@ -19,7 +18,6 @@ CONFIG_ARCH_IOP32X=y
 # CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_SA1100 is not set
 # CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_OMAP is not set
 ## end choice
 CONFIG_PCI=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
@@ -309,7 +307,6 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
 CONFIG_MTD_CMDLINE_PARTS=y
 # CONFIG_MTD_AFS_PARTS is not set
-CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLOCK=y
 CONFIG_FTL=m
 CONFIG_NFTL=m
@@ -356,9 +353,6 @@ CONFIG_MTD_RAM=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
@@ -682,3 +676,12 @@ CONFIG_SND_RIPTIDE=m
 ##
 # CONFIG_SND_HDA_INTEL is not set
 
+##
+## file: unknown
+##
+# CONFIG_ARCH_H720X 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
+
diff --git a/debian/config/armel/config.ixp4xx b/debian/config/armel/config.ixp4xx
index 5474789e906b..968ada8164e8 100644
--- a/debian/config/armel/config.ixp4xx
+++ b/debian/config/armel/config.ixp4xx
@@ -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_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
 CONFIG_ARCH_IXP4XX=y
@@ -19,7 +18,6 @@ CONFIG_ARCH_IXP4XX=y
 # CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_SA1100 is not set
 # CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_OMAP is not set
 ## end choice
 CONFIG_PCI=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
@@ -302,6 +300,10 @@ CONFIG_INPUT_TOUCHSCREEN=y
 ##
 CONFIG_LEDS_FSG=y
 CONFIG_LEDS_GPIO=y
+
+##
+## file: drivers/leds/trigger/Kconfig
+##
 CONFIG_LEDS_TRIGGER_TIMER=y
 
 ##
@@ -330,7 +332,6 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
 # CONFIG_MTD_CMDLINE_PARTS is not set
 # CONFIG_MTD_AFS_PARTS is not set
-CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLOCK=y
 CONFIG_FTL=m
 CONFIG_NFTL=m
@@ -377,9 +378,6 @@ CONFIG_MTD_M25P80=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
@@ -810,3 +808,12 @@ CONFIG_SND_PCXHR=m
 ##
 # CONFIG_SND_HDA_INTEL is not set
 
+##
+## file: unknown
+##
+# CONFIG_ARCH_H720X 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
+
diff --git a/debian/config/config b/debian/config/config
index a2a16d46d6a4..edd585963f26 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -1,4 +1,10 @@
 ##
+## file: arch/Kconfig
+##
+CONFIG_KPROBES=y
+CONFIG_UPROBES=y
+
+##
 ## file: block/Kconfig
 ##
 CONFIG_BLOCK=y
@@ -4129,8 +4135,8 @@ CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=y
 CONFIG_NFS_SWAP=y
 CONFIG_NFS_V4_1=y
-CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
 CONFIG_NFS_V4_2=y
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
 CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 
@@ -5232,9 +5238,11 @@ CONFIG_NET_CLS_IND=y
 CONFIG_IP_SCTP=m
 CONFIG_NET_SCTPPROBE=m
 # CONFIG_SCTP_DBG_OBJCNT is not set
+## choice: Default SCTP cookie HMAC encoding
 CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
 # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
+## end choice
 CONFIG_SCTP_COOKIE_HMAC_MD5=y
 CONFIG_SCTP_COOKIE_HMAC_SHA1=y
 
@@ -5507,7 +5515,6 @@ 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
@@ -5519,7 +5526,6 @@ CONFIG_NFC_LLCP=y
 # 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
diff --git a/debian/config/hppa/config b/debian/config/hppa/config
index fb20caf2a1cd..626158f7a6a2 100644
--- a/debian/config/hppa/config
+++ b/debian/config/hppa/config
@@ -412,11 +412,6 @@ CONFIG_PDC_STABLE=y
 # CONFIG_HOTPLUG_PCI is not set
 
 ##
-## file: drivers/pci/pcie/Kconfig
-##
-# CONFIG_PCIEPORTBUS is not set
-
-##
 ## file: drivers/pcmcia/Kconfig
 ##
 CONFIG_PCCARD=m
@@ -729,3 +724,8 @@ CONFIG_SND_HARMONY=m
 ##
 # CONFIG_SND_HDA_INTEL is not set
 
+##
+## file: unknown
+##
+# CONFIG_PCIEPORTBUS is not set
+
diff --git a/debian/config/m68k/config b/debian/config/m68k/config
index ca3659e31481..a6a258840a9d 100644
--- a/debian/config/m68k/config
+++ b/debian/config/m68k/config
@@ -126,11 +126,6 @@ CONFIG_NVRAM=y
 CONFIG_CONNECTOR=m
 
 ##
-## file: drivers/cpufreq/Kconfig
-##
-# CONFIG_CPU_FREQ is not set
-
-##
 ## file: drivers/crypto/Kconfig
 ##
 # CONFIG_CRYPTO_HW is not set
@@ -754,23 +749,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_MODULE_SIG is not set
 
 ##
-## file: kernel/Kconfig.hz
-##
-## choice: Timer frequency
-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_RUNTIME is not set
-
-##
 ## file: kernel/time/Kconfig
 ##
 ## choice: Timer tick handling
@@ -951,3 +929,15 @@ CONFIG_DMASOUND_ATARI=m
 CONFIG_DMASOUND_PAULA=m
 CONFIG_DMASOUND_Q40=m
 
+##
+## file: unknown
+##
+# CONFIG_CPU_FREQ is not set
+# CONFIG_HIBERNATION is not set
+CONFIG_HZ_100=y
+# CONFIG_HZ_1000 is not set
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_300 is not set
+# CONFIG_PM_RUNTIME is not set
+# CONFIG_SUSPEND is not set
+
diff --git a/debian/config/mips/config.octeon b/debian/config/mips/config.octeon
index 4e583d078bbd..da9b9f1f93ee 100644
--- a/debian/config/mips/config.octeon
+++ b/debian/config/mips/config.octeon
@@ -1,7 +1,9 @@
 ##
 ## file: arch/mips/Kconfig
 ##
+## choice: System type
 CONFIG_CAVIUM_OCTEON_SOC=y
+## end choice
 # CONFIG_HOTPLUG_CPU is not set
 ## choice: Kernel code model
 # CONFIG_32BIT is not set