diff --git a/debian/config/config b/debian/config/config
index 65739cddc..3e6a77ca7 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -58,6 +58,7 @@ CONFIG_FUTEX=y
 CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
 CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
@@ -573,6 +574,7 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=m
 # CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
 
 #
 # Connector - unified userspace <-> kernelspace linker
@@ -851,6 +853,7 @@ CONFIG_FUSION_SAS=m
 CONFIG_FUSION_MAX_SGE=40
 CONFIG_FUSION_CTL=m
 CONFIG_FUSION_LAN=m
+# CONFIG_FUSION_LOGGING is not set
 
 #
 # IEEE 1394 (FireWire) support
@@ -1164,6 +1167,15 @@ CONFIG_USB_SISUSBVGA_CON=y
 CONFIG_USB_LD=m
 CONFIG_USB_TRANCEVIBRATOR=m
 CONFIG_USB_IOWARRIOR=m
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_SELECTED=y
+# CONFIG_USB_GADGET_AMD5536UDC is not set
+# CONFIG_USB_GADGET_FSL_USB2 is not set
+# CONFIG_USB_GADGET_M66592 is not set
+# CONFIG_USB_GADGET_S3C2410 is not set
+# CONFIG_USB_GADGET_AT91 is not set
+CONFIG_USB_MIDI_GADGET=m
 
 CONFIG_UNIX98_PTYS=y
 
@@ -1298,7 +1310,6 @@ CONFIG_SND_USB_CAIAQ_INPUT=y
 CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_CS5530=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
-CONFIG_USB_GADGET_SELECTED=y
 CONFIG_USB_ISP116X_HCD=m
 CONFIG_SERIAL_8250_HUB6=m
 CONFIG_SERIAL_8250_MCA=m
@@ -1652,6 +1663,11 @@ CONFIG_DVB_TUA6100=m
 CONFIG_DAB=y
 CONFIG_USB_DABUSB=m
 
+#
+# Graphics support
+#
+CONFIG_VGASTATE=m
+
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 # CONFIG_LCD_CLASS_DEVICE is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
@@ -1717,6 +1733,14 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_PERSIST is not set
 # CONFIG_USB_G_PRINTER is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_U132_HCD=m
+CONFIG_USB_R8A66597_HCD=m
+
 # CONFIG_MMC_UNSAFE_RESUME is not set
 
 #
@@ -1780,7 +1804,12 @@ CONFIG_INFINIBAND_ISER=m
 CONFIG_RTC_CLASS=m
 
 #
-## RTC interfaces
+# Reporting subsystems
+#
+CONFIG_EDAC_I82975X=m
+
+#
+# RTC interfaces
 #
 CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
@@ -1822,6 +1851,11 @@ CONFIG_RTC_DRV_M48T86=m
 CONFIG_RTC_DRV_M48T59=m
 CONFIG_RTC_DRV_V3020=m
 
+#
+# on-CPU RTC drivers
+#
+# CONFIG_AUXDISPLAY is not set
+
 CONFIG_USB_XUSBATM=m
 CONFIG_PCMCIA_LOAD_CIS=y
 CONFIG_SERIAL_8250_FOURPORT=m
@@ -1883,7 +1917,6 @@ CONFIG_SND_RIPTIDE=m
 # CONFIG_VGACON_SOFT_SCROLLBACK is not set
 CONFIG_USB_ZC0301=m
 CONFIG_USB_ARCH_HAS_EHCI=y
-# CONFIG_USB_GADGET_AT91 is not set
 CONFIG_SND_VERBOSE_PROCFS=y
 CONFIG_WIRELESS_EXT=y
 CONFIG_SND_ALS300=m
@@ -2121,17 +2154,14 @@ CONFIG_DLM_DEBUG=y
 CONFIG_HW_RANDOM=y
 CONFIG_SND_MIA=m
 CONFIG_MCS_FIR=m
-CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_SND_INDIGODJ=m
 CONFIG_SND_ECHO3G=m
 CONFIG_SND_LAYLA20=m
-# CONFIG_SYS_HYPERVISOR is not set
 CONFIG_SND_LAYLA24=m
 CONFIG_SND_MONA=m
 CONFIG_LEDS_NET48XX=m
 # CONFIG_LEGACY_PTYS is not set
 
-CONFIG_USB_U132_HCD=m
 CONFIG_SND_MTS64=m
 CONFIG_SMSC37B787_WDT=m
 CONFIG_SND_AC97_POWER_SAVE=y
@@ -2140,25 +2170,14 @@ CONFIG_USB_STORAGE_KARMA=y
 # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
 CONFIG_W83697HF_WDT=m
 CONFIG_ITCO_WDT=m
-CONFIG_USB_MIDI_GADGET=m
 CONFIG_HOTPLUG_PCI_CPCI=y
 CONFIG_PC87413_WDT=m
 CONFIG_MOXA_SMARTIO=m
 # CONFIG_ITCO_VENDOR_SUPPORT is not set
 # CONFIG_SND_SOC is not set
 CONFIG_SND_SB_COMMON=m
-# CONFIG_USB_GADGET_DEBUG is not set
-# CONFIG_USB_GADGET_DEBUG_FS is not set
-# CONFIG_FUSION_LOGGING is not set
-# CONFIG_USB_GADGET_S3C2410 is not set
-# CONFIG_USB_GADGET_M66592 is not set
-CONFIG_VGASTATE=m
-CONFIG_TIMERFD=y
-# CONFIG_USB_GADGET_AMD5536UDC is not set
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-# CONFIG_USB_GADGET_FSL_USB2 is not set
-CONFIG_EDAC_I82975X=m
 CONFIG_SND_SB16_DSP=m
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
 CONFIG_SND_OXYGEN=m
 CONFIG_SND_HIFIER=m
 CONFIG_SND_VIRTUOSO=m
@@ -2174,6 +2193,4 @@ CONFIG_SND_HDA_CODEC_SI3054=y
 CONFIG_SND_HDA_GENERIC=y
 CONFIG_SND_HDA_POWER_SAVE=y
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
-# CONFIG_AUXDISPLAY is not set
 CONFIG_MTD_NAND_CS553X=m
-CONFIG_USB_R8A66597_HCD=m