diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index 179d2b75b..4a17d1bff 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -31,8 +31,8 @@ CONFIG_X86_MSR=m
 CONFIG_X86_CPUID=m
 CONFIG_NODES_SHIFT=6
 CONFIG_MTRR=y
-CONFIG_EFI=y
 # CONFIG_X86_PAT is not set
+CONFIG_EFI=y
 # CONFIG_SECCOMP is not set
 # CONFIG_CC_STACKPROTECTOR is not set
 CONFIG_KEXEC=y
diff --git a/debian/config/arm/config b/debian/config/arm/config
index dec8a4051..b888120c0 100644
--- a/debian/config/arm/config
+++ b/debian/config/arm/config
@@ -6,6 +6,11 @@
 ## end choice
 # CONFIG_AEABI is not set
 
+##
+## file: drivers/ieee1394/Kconfig
+##
+# CONFIG_IEEE1394 is not set
+
 ##
 ## file: drivers/input/Kconfig
 ##
@@ -61,5 +66,3 @@
 CONFIG_ECONET_AUNUDP=y
 CONFIG_ECONET_NATIVE=y
 
-# CONFIG_IEEE1394 is not set
-
diff --git a/debian/config/arm/config.ixp4xx b/debian/config/arm/config.ixp4xx
index 9cecc2a98..af8850da0 100644
--- a/debian/config/arm/config.ixp4xx
+++ b/debian/config/arm/config.ixp4xx
@@ -539,10 +539,10 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_TEST is not set
 # CONFIG_RTC_DRV_DS1672 is not set
 # CONFIG_RTC_DRV_RS5C372 is not set
+CONFIG_RTC_DRV_ISL1208=y
 CONFIG_RTC_DRV_X1205=y
 CONFIG_RTC_DRV_PCF8563=y
 # CONFIG_RTC_DRV_M48T86 is not set
-CONFIG_RTC_DRV_ISL1208=y
 
 ##
 ## file: drivers/scsi/Kconfig
diff --git a/debian/config/arm/config.orion5x b/debian/config/arm/config.orion5x
index b076d5129..4e9cc91e8 100644
--- a/debian/config/arm/config.orion5x
+++ b/debian/config/arm/config.orion5x
@@ -66,6 +66,8 @@ CONFIG_MACH_RD88F5182=y
 CONFIG_MACH_KUROBOX_PRO=y
 CONFIG_MACH_DNS323=y
 CONFIG_MACH_TS209=y
+CONFIG_MACH_TS409=y
+CONFIG_MACH_MV2120=y
 CONFIG_MACH_LINKSTATION_PRO=y
 
 ##
@@ -164,6 +166,16 @@ CONFIG_INPUT_EVDEV=m
 ##
 CONFIG_KEYBOARD_GPIO=m
 
+##
+## file: drivers/leds/Kconfig
+##
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+
 ##
 ## file: drivers/media/Kconfig
 ##
@@ -480,23 +492,3 @@ CONFIG_AX25=m
 CONFIG_NETROM=m
 CONFIG_ROSE=m
 
-##
-## file: unknown
-##
-CONFIG_MACH_MV2120=y
-CONFIG_MACH_TS409=y
-
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-
-#
-# LED drivers
-CONFIG_LEDS_GPIO=y
-
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-
-CONFIG_INPUT_EVDEV=m
-CONFIG_KEYBOARD_GPIO=m
-
diff --git a/debian/config/armel/config b/debian/config/armel/config
index 52d19d4c1..281fb19df 100644
--- a/debian/config/armel/config
+++ b/debian/config/armel/config
@@ -7,30 +7,58 @@
 CONFIG_AEABI=y
 CONFIG_OABI_COMPAT=y
 
+##
+## file: drivers/ieee1394/Kconfig
+##
+# CONFIG_IEEE1394 is not set
+
 ##
 ## file: drivers/net/wireless/Kconfig
 ##
 # CONFIG_IPW2100 is not set
 
+##
+## file: drivers/scsi/Kconfig
+##
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_HPTIOP is not set
+
+##
+## file: drivers/scsi/aic7xxx/Kconfig.aic79xx
+##
+# CONFIG_SCSI_AIC79XX is not set
+
+##
+## file: drivers/scsi/aic7xxx/Kconfig.aic7xxx
+##
+# CONFIG_SCSI_AIC7XXX is not set
+
+##
+## file: drivers/scsi/aic94xx/Kconfig
+##
+# CONFIG_SCSI_AIC94XX is not set
+
+##
+## file: drivers/scsi/megaraid/Kconfig.megaraid
+##
+# CONFIG_MEGARAID_SAS is not set
+
+##
+## file: drivers/scsi/qla2xxx/Kconfig
+##
+# CONFIG_SCSI_QLA_FC is not set
+
+##
+## file: drivers/scsi/qla4xxx/Kconfig
+##
+# CONFIG_SCSI_QLA_ISCSI is not set
+
 ##
 ## file: net/econet/Kconfig
 ##
 CONFIG_ECONET_AUNUDP=y
 CONFIG_ECONET_NATIVE=y
 
-# CONFIG_IEEE1394 is not set
-
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_SCSI_3W_9XXX is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_AIC94XX is not set
-
-# CONFIG_MEGARAID_SAS is not set
-# CONFIG_SCSI_HPTIOP is not set
-
-# CONFIG_SCSI_QLA_FC is not set
-# CONFIG_SCSI_QLA_ISCSI is not set
-
diff --git a/debian/config/config b/debian/config/config
index 0551cfbd7..52699a9b0 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -187,6 +187,7 @@ CONFIG_BT_HCIUART_LL=y
 ##
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
 CONFIG_DEVKMEM=y
+CONFIG_COMPUTONE=m
 CONFIG_MOXA_SMARTIO=m
 CONFIG_SYNCLINK_GT=m
 CONFIG_RISCOM8=m
@@ -347,15 +348,15 @@ CONFIG_BLK_DEV_TC86C001=m
 ## file: drivers/ieee1394/Kconfig
 ##
 CONFIG_IEEE1394=m
-# CONFIG_IEEE1394_VERBOSEDEBUG is not set
-CONFIG_IEEE1394_PCILYNX=m
 CONFIG_IEEE1394_OHCI1394=m
-CONFIG_IEEE1394_VIDEO1394=m
+CONFIG_IEEE1394_PCILYNX=m
 CONFIG_IEEE1394_SBP2=m
 # CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
 CONFIG_IEEE1394_ETH1394=m
-CONFIG_IEEE1394_DV1394=m
 CONFIG_IEEE1394_RAWIO=m
+CONFIG_IEEE1394_VIDEO1394=m
+CONFIG_IEEE1394_DV1394=m
+# CONFIG_IEEE1394_VERBOSEDEBUG is not set
 
 ##
 ## file: drivers/infiniband/Kconfig
@@ -1321,6 +1322,7 @@ CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_M41T80=m
 # CONFIG_RTC_DRV_M41T80_WDT is not set
 CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m
 CONFIG_RTC_DRV_MAX6902=m
 CONFIG_RTC_DRV_R9701=m
 CONFIG_RTC_DRV_RS5C348=m
@@ -1746,7 +1748,9 @@ CONFIG_JFFS2_ZLIB=y
 CONFIG_JFFS2_LZO=y
 CONFIG_JFFS2_RTIME=y
 # CONFIG_JFFS2_RUBIN is not set
+## choice: JFFS2 default compression mode
 CONFIG_JFFS2_CMODE_PRIORITY=y
+## end choice
 CONFIG_CRAMFS=m
 CONFIG_VXFS_FS=m
 CONFIG_MINIX_FS=m
@@ -2405,7 +2409,6 @@ CONFIG_NET_SCH_HTB=m
 CONFIG_NET_SCH_HFSC=m
 CONFIG_NET_SCH_ATM=m
 CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_RR=m
 CONFIG_NET_SCH_RED=m
 CONFIG_NET_SCH_SFQ=m
 CONFIG_NET_SCH_TEQL=m
@@ -2609,6 +2612,5 @@ CONFIG_INITRAMFS_SOURCE=""
 ##
 ## file: unknown
 ##
-CONFIG_COMPUTONE=m
-CONFIG_RTC_DRV_FM3130=m
+CONFIG_NET_SCH_RR=m
 
diff --git a/debian/config/ia64/config b/debian/config/ia64/config
index 3e14a04f2..91eb2123e 100644
--- a/debian/config/ia64/config
+++ b/debian/config/ia64/config
@@ -289,13 +289,13 @@ CONFIG_BLK_DEV_VIA82CXXX=m
 ## file: drivers/ieee1394/Kconfig
 ##
 CONFIG_IEEE1394=m
-CONFIG_IEEE1394_PCILYNX=m
 CONFIG_IEEE1394_OHCI1394=m
-CONFIG_IEEE1394_VIDEO1394=m
+CONFIG_IEEE1394_PCILYNX=m
 CONFIG_IEEE1394_SBP2=m
 CONFIG_IEEE1394_ETH1394=m
-CONFIG_IEEE1394_DV1394=m
 CONFIG_IEEE1394_RAWIO=m
+CONFIG_IEEE1394_VIDEO1394=m
+CONFIG_IEEE1394_DV1394=m
 
 ##
 ## file: drivers/input/Kconfig
diff --git a/debian/config/m68k/config b/debian/config/m68k/config
index bfeda7d78..2ade96f0a 100644
--- a/debian/config/m68k/config
+++ b/debian/config/m68k/config
@@ -171,6 +171,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 ##
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
+# CONFIG_EXT4DEV_FS is not set
 # CONFIG_JBD_DEBUG is not set
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
@@ -289,6 +290,3 @@ CONFIG_LOG_BUF_SHIFT=16
 #. TODO
 CONFIG_NET_KEY=y
 
-# disable EXT4 for m68k
-CONFIG_EXT4DEV_FS=n
-
diff --git a/debian/config/mips/config.r5k-ip32 b/debian/config/mips/config.r5k-ip32
index 2f53cc4d5..6c2674c09 100644
--- a/debian/config/mips/config.r5k-ip32
+++ b/debian/config/mips/config.r5k-ip32
@@ -714,6 +714,11 @@ CONFIG_SND_SUPPORT_OLD_API=y
 # CONFIG_SND_SERIAL_U16550 is not set
 # CONFIG_SND_MPU401 is not set
 
+##
+## file: sound/mips/Kconfig
+##
+CONFIG_SND_SGI_O2=m
+
 ##
 ## file: sound/oss/Kconfig
 ##
@@ -773,5 +778,3 @@ CONFIG_SND_KORG1212=m
 # CONFIG_SND_VX222 is not set
 # CONFIG_SND_YMFPCI is not set
 
-CONFIG_SND_SGI_O2=m
-
diff --git a/debian/config/powerpc/config.powerpc64 b/debian/config/powerpc/config.powerpc64
index 9bc4a3fdb..71536c55f 100644
--- a/debian/config/powerpc/config.powerpc64
+++ b/debian/config/powerpc/config.powerpc64
@@ -156,9 +156,9 @@ CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
 ##
 # CONFIG_HOTPLUG_PCI is not set
 
-###
-### file: drivers/rtc/Kconfig
-###
+##
+## file: drivers/rtc/Kconfig
+##
 CONFIG_RTC_DRV_PPC=m
 
 ##