UBUNTU: [Config] highbank -- commonise numerous subsystem selectors

Signed-off-by: Andy Whitcroft <apw@canonical.com>

9 files changed, 39 insertions, 150 deletions

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 31eb4154867..91a6e144a0b 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -48,24 +48,19 @@ CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
 CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_CLEANCACHE=y
 CONFIG_COMPACTION=y
-CONFIG_CONNECTOR=y
 CONFIG_CORDIC=m
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_IDLE=y
 CONFIG_CRASH_DUMP=y
 CONFIG_CRYPTO_LZO=y
-CONFIG_CUSE=m
 CONFIG_DE600=m
 CONFIG_DE620=m
 CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_KERNEL=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
-CONFIG_DMA_SHARED_BUFFER=y
 CONFIG_DM_RAID45=m
-CONFIG_DNET=m
-CONFIG_DRM=m
 # CONFIG_DVB_FE_CUSTOMISE is not set
 # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
 CONFIG_ECHO=m
@@ -89,7 +84,6 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 CONFIG_FB_DDC=m
 # CONFIG_FB_MACMODES is not set
 CONFIG_FB_METRONOME=m
-CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_RADEON=m
 CONFIG_FB_S1D13XXX=m
 CONFIG_FB_SM7XX=m
@@ -104,8 +98,6 @@ CONFIG_FB_UDL=m
 CONFIG_FB_VOODOO1=m
 CONFIG_FIRMWARE_EDID=y
 # CONFIG_FONTS is not set
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-CONFIG_FSCACHE=m
 CONFIG_FT1000=m
 CONFIG_FTRACE=y
 CONFIG_FUNCTION_TRACER=y
@@ -117,16 +109,13 @@ CONFIG_HARDLOCKUP_DETECTOR=y
 # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
 CONFIG_HIDRAW=y
-CONFIG_HOSTAP=m
 CONFIG_HTC_I2CPLD=y
 CONFIG_HTC_PASIC3=m
 CONFIG_HUGETLB_PAGE=y
-CONFIG_HW_RANDOM=y
 CONFIG_HZ=250
 CONFIG_I2C_ALGOBIT=m
 # CONFIG_I2C_HELPER_AUTO is not set
 # CONFIG_IDE is not set
-CONFIG_IIO=m
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 CONFIG_INLINE_READ_UNLOCK=y
 CONFIG_INLINE_READ_UNLOCK_IRQ=y
@@ -182,7 +171,6 @@ CONFIG_LIBFCOE=m
 CONFIG_LIBIPW_DEBUG=y
 CONFIG_LIS3L02DQ=m
 CONFIG_LLC=y
-CONFIG_LLC2=m
 CONFIG_LOGIG940_FF=y
 CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_LOGITECH_FF=y
@@ -197,7 +185,6 @@ CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAX_RAW_DEVS=256
 CONFIG_MEDIA_SUPPORT=m
 CONFIG_MEMORY_HOTREMOVE=y
-CONFIG_MEMSTICK=m
 CONFIG_MFD_88PM860X=y
 CONFIG_MFD_AAT2870_CORE=y
 CONFIG_MFD_MAX8925=y
@@ -220,7 +207,6 @@ CONFIG_MFD_WM8350_I2C=y
 CONFIG_MFD_WM8400=m
 CONFIG_MFD_WM8994=y
 CONFIG_MICREL_PHY=m
-CONFIG_MII=y
 CONFIG_MINIX_SUBPARTITION=y
 CONFIG_MMC_BLOCK=m
 CONFIG_MMC_SDHCI=m
@@ -272,7 +258,6 @@ CONFIG_OPROFILE=m
 CONFIG_OSF_PARTITION=y
 CONFIG_OUTPUT_FORMAT="elf64-x86-64"
 CONFIG_P54_COMMON=m
-CONFIG_PANEL=m
 CONFIG_PARPORT_1284=y
 CONFIG_PARPORT_AX88796=m
 CONFIG_PARPORT_PC=m
@@ -280,7 +265,6 @@ CONFIG_PATA_ARASAN_CF=m
 CONFIG_PATA_SIS=y
 CONFIG_PCCARD=m
 CONFIG_PERF_COUNTERS=y
-CONFIG_PHONE=m
 CONFIG_PHYSICAL_START=0x1000000
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_PMIC_ADP5520=y
@@ -370,14 +354,12 @@ CONFIG_SERIO_RAW=m
 CONFIG_SERIO_SERPORT=m
 CONFIG_SGI_PARTITION=y
 CONFIG_SLHC=y
-CONFIG_SLIP=m
 # CONFIG_SND_BT87X_OVERCLOCK is not set
 CONFIG_SND_EMU10K1_SEQ=m
 CONFIG_SND_OPL3_LIB_SEQ=m
 # CONFIG_SND_OPL4_LIB_SEQ is not set
 # CONFIG_SND_SBAWE_SEQ is not set
 CONFIG_SOLARIS_X86_PARTITION=y
-CONFIG_SOUND=m
 CONFIG_SPARSEMEM_MANUAL=y
 CONFIG_SPEAKUP_SYNTH_DUMMY=m
 CONFIG_SPI_ALTERA=m
@@ -393,7 +375,6 @@ CONFIG_SPI_TLE62X0=m
 CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XATTR=y
 CONFIG_SQUASHFS_XZ=y
-CONFIG_SSB=m
 # CONFIG_SSB_PCMCIAHOST is not set
 CONFIG_STACK_TRACER=y
 CONFIG_STAGING_MEDIA=y
@@ -410,7 +391,6 @@ CONFIG_TCG_TPM=y
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_MD5SIG=y
 CONFIG_TEST_KSTRTOX=m
-CONFIG_THERMAL=y
 CONFIG_TIMB_DMA=m
 CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
 CONFIG_TOUCHSCREEN_EETI=m
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 079b6c87ee4..0ddf439c66b 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -48,14 +48,12 @@ CONFIG_CGROUPS=y
 CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_CLEANCACHE=y
 # CONFIG_COMPACTION is not set
-CONFIG_CONNECTOR=y
 CONFIG_CORDIC=m
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_IDLE=y
 CONFIG_CRASH_DUMP=y
 CONFIG_CRYPTO_LZO=m
-CONFIG_CUSE=m
 CONFIG_DE600=m
 CONFIG_DE620=m
 CONFIG_DEBUG_INFO=y
@@ -64,10 +62,7 @@ CONFIG_DEBUG_USER=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 CONFIG_DM9000=m
-CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_DM_RAID45 is not set
-CONFIG_DNET=m
-CONFIG_DRM=m
 CONFIG_DVB_FE_CUSTOMISE=y
 # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
 CONFIG_DW_DMAC=m
@@ -91,7 +86,6 @@ CONFIG_FB_CFB_IMAGEBLIT=m
 # CONFIG_FB_DDC is not set
 # CONFIG_FB_MACMODES is not set
 CONFIG_FB_METRONOME=m
-CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_S1D13XXX=m
 CONFIG_FB_SM7XX=m
 CONFIG_FB_SMSCUFX=m
@@ -106,8 +100,6 @@ CONFIG_FB_UDL=m
 CONFIG_FONTS=y
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_FPE_NWFPE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-CONFIG_FSCACHE=m
 CONFIG_FT1000=m
 CONFIG_FTRACE=y
 # CONFIG_FUNCTION_TRACER is not set
@@ -119,18 +111,15 @@ CONFIG_HAVE_AOUT=y
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_HIDRAW=y
 # CONFIG_HIGHMEM is not set
-CONFIG_HOSTAP=m
 CONFIG_HTC_EGPIO=y
 CONFIG_HTC_I2CPLD=y
 CONFIG_HTC_PASIC3=m
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_HVC_DCC=y
-CONFIG_HW_RANDOM=y
 CONFIG_HZ=128
 CONFIG_I2C_ALGOBIT=m
 CONFIG_I2C_DESIGNWARE_PLATFORM=m
 # CONFIG_I2C_HELPER_AUTO is not set
-CONFIG_IIO=m
 CONFIG_INLINE_READ_UNLOCK=y
 CONFIG_INLINE_READ_UNLOCK_IRQ=y
 CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
@@ -184,7 +173,6 @@ CONFIG_LIBFC=m
 CONFIG_LIBFCOE=m
 # CONFIG_LIS3L02DQ is not set
 CONFIG_LLC=m
-CONFIG_LLC2=m
 CONFIG_LOGIG940_FF=y
 CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_LOGITECH_FF=y
@@ -198,7 +186,6 @@ CONFIG_MAC_PARTITION=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAX_RAW_DEVS=256
 CONFIG_MEDIA_SUPPORT=m
-CONFIG_MEMSTICK=m
 CONFIG_MFD_88PM860X=y
 CONFIG_MFD_AAT2870_CORE=y
 CONFIG_MFD_ASIC3=y
@@ -226,7 +213,6 @@ CONFIG_MFD_WM8400=m
 CONFIG_MFD_WM8994=y
 CONFIG_MG_DISK=m
 CONFIG_MICREL_PHY=m
-CONFIG_MII=y
 CONFIG_MINIX_SUBPARTITION=y
 CONFIG_MMC_ARMMMCI=m
 CONFIG_MMC_BLOCK=y
@@ -281,14 +267,12 @@ CONFIG_OPROFILE=m
 CONFIG_OSF_PARTITION=y
 CONFIG_P54_COMMON=m
 CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_PANEL=m
 CONFIG_PARPORT_1284=y
 CONFIG_PARPORT_AX88796=m
 CONFIG_PATA_ARASAN_CF=m
 # CONFIG_PCCARD is not set
 # CONFIG_PCI_SYSCALL is not set
 CONFIG_PERF_COUNTERS=y
-CONFIG_PHONE=m
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_PL330_DMA=m
 CONFIG_PMIC_ADP5520=y
@@ -379,7 +363,6 @@ CONFIG_SERIO_RAW=m
 CONFIG_SERIO_SERPORT=m
 CONFIG_SGI_PARTITION=y
 CONFIG_SLHC=y
-CONFIG_SLIP=m
 CONFIG_SMC911X=m
 CONFIG_SMC91X=m
 CONFIG_SMSC911X=m
@@ -388,7 +371,6 @@ CONFIG_SMSC911X=m
 # CONFIG_SND_OPL4_LIB_SEQ is not set
 # CONFIG_SND_SBAWE_SEQ is not set
 CONFIG_SOLARIS_X86_PARTITION=y
-CONFIG_SOUND=m
 CONFIG_SPEAKUP_SYNTH_DUMMY=m
 CONFIG_SPI_ALTERA=m
 CONFIG_SPI_BITBANG=m
@@ -404,7 +386,6 @@ CONFIG_SPI_TLE62X0=m
 CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XATTR=y
 CONFIG_SQUASHFS_XZ=y
-CONFIG_SSB=m
 # CONFIG_STACK_TRACER is not set
 CONFIG_STAGING_MEDIA=y
 CONFIG_STANDALONE=y
@@ -421,7 +402,6 @@ CONFIG_TCG_TPM=y
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_MD5SIG=y
 CONFIG_TEST_KSTRTOX=m
-CONFIG_THERMAL=y
 CONFIG_TIMB_DMA=m
 CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
 # CONFIG_TOUCHSCREEN_EETI is not set
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index fecddf7b9d2..5f731cf22f3 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -8,7 +8,6 @@
 # CONFIG_ATA_NONSTANDARD is not set
 CONFIG_ATM_BR2684_IPFILTER=y
 CONFIG_AX25_DAMA_SLAVE=y
-CONFIG_BCH=y
 # CONFIG_BLK_DEV_SR_VENDOR is not set
 # CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
 # CONFIG_COMPACTION is not set
@@ -54,14 +53,6 @@ CONFIG_LOG_BUF_SHIFT=17
 CONFIG_MAX_RAW_DEVS=256
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_SDHCI=y
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_BCH=y
-CONFIG_MTD_NAND_ECC=y
-CONFIG_MTD_NAND_IDS=y
-CONFIG_MTD_OF_PARTS=y
 # CONFIG_MTD_SM_COMMON is not set
 CONFIG_NEED_DMA_MAP_STATE=y
 # CONFIG_NL80211_TESTMODE is not set
diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank
index 630987c8095..d28cd805cb6 100644
--- a/debian.master/config/armhf/config.flavour.highbank
+++ b/debian.master/config/armhf/config.flavour.highbank
@@ -23,6 +23,7 @@ CONFIG_ARCH_HIGHBANK=y
 # CONFIG_B43LEGACY is not set
 # CONFIG_B44 is not set
 # CONFIG_BATMAN_ADV is not set
+CONFIG_BCH=m
 # CONFIG_BCMA is not set
 # CONFIG_BCM_WIMAX is not set
 # CONFIG_BINARY_PRINTF is not set
@@ -37,21 +38,16 @@ CONFIG_CACHE_L2X0=y
 # CONFIG_CGROUPS is not set
 # CONFIG_CHECKPOINT_RESTORE is not set
 # CONFIG_CLEANCACHE is not set
-# CONFIG_CONNECTOR is not set
 # CONFIG_CORDIC is not set
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 # CONFIG_CPU_IDLE is not set
 # CONFIG_CRASH_DUMP is not set
-# CONFIG_CUSE is not set
 # CONFIG_DE600 is not set
 # CONFIG_DE620 is not set
 # CONFIG_DEBUG_KERNEL is not set
 # CONFIG_DEBUG_USER is not set
 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
 # CONFIG_DM9000 is not set
-# CONFIG_DMA_SHARED_BUFFER is not set
-# CONFIG_DNET is not set
-# CONFIG_DRM is not set
 # CONFIG_DW_DMAC is not set
 # CONFIG_ECHO is not set
 CONFIG_ENABLE_MUST_CHECK=y
@@ -65,31 +61,25 @@ CONFIG_EXT2_FS=y
 # CONFIG_FB_ARMCLCD is not set
 # CONFIG_FB_BROADSHEET is not set
 # CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MODE_HELPERS is not set
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_SM7XX is not set
 # CONFIG_FB_SMSCUFX is not set
 # CONFIG_FB_UDL is not set
 # CONFIG_FONTS is not set
 # CONFIG_FPE_NWFPE is not set
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-# CONFIG_FSCACHE is not set
 # CONFIG_FT1000 is not set
 # CONFIG_FTRACE is not set
 # CONFIG_GPIO_SYSFS is not set
 # CONFIG_HAMRADIO is not set
 # CONFIG_HIDRAW is not set
 CONFIG_HIGHMEM=y
-# CONFIG_HOSTAP is not set
 # CONFIG_HTC_EGPIO is not set
 # CONFIG_HTC_I2CPLD is not set
 # CONFIG_HTC_PASIC3 is not set
 # CONFIG_HVC_DCC is not set
-# CONFIG_HW_RANDOM is not set
 CONFIG_HZ=100
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_HELPER_AUTO=y
-# CONFIG_IIO is not set
 # CONFIG_INLINE_READ_UNLOCK is not set
 # CONFIG_INLINE_READ_UNLOCK_IRQ is not set
 # CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
@@ -135,7 +125,6 @@ CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_LIBERTAS_THINFIRM is not set
 # CONFIG_LIBFC is not set
 # CONFIG_LIBFCOE is not set
-# CONFIG_LLC2 is not set
 # CONFIG_LOGIG940_FF is not set
 # CONFIG_LOGIRUMBLEPAD2_FF is not set
 # CONFIG_LOGITECH_FF is not set
@@ -147,7 +136,6 @@ CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_MAC_PARTITION is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MEDIA_SUPPORT is not set
-# CONFIG_MEMSTICK is not set
 # CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_AAT2870_CORE is not set
 # CONFIG_MFD_ASIC3 is not set
@@ -175,7 +163,6 @@ CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_MFD_WM8994 is not set
 # CONFIG_MG_DISK is not set
 CONFIG_MICREL_PHY=y
-CONFIG_MII=m
 # CONFIG_MINIX_SUBPARTITION is not set
 # CONFIG_MMC_ARMMMCI is not set
 # CONFIG_MMC_DW is not set
@@ -194,7 +181,15 @@ CONFIG_MMC_SDHCI_PLTFM=y
 # CONFIG_MOUSE_SERIAL is not set
 # CONFIG_MOUSE_SYNAPTICS_I2C is not set
 # CONFIG_MOUSE_VSXXXAA is not set
-# CONFIG_MTD is not set
+CONFIG_MTD=m
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_CHAR=m
+CONFIG_MTD_NAND=m
+CONFIG_MTD_NAND_BCH=m
+CONFIG_MTD_NAND_ECC=m
+CONFIG_MTD_NAND_IDS=m
+CONFIG_MTD_OF_PARTS=m
 CONFIG_MUSB_PIO_ONLY=y
 CONFIG_MUTEX_SPIN_ON_OWNER=y
 # CONFIG_MWIFIEX is not set
@@ -215,12 +210,10 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 CONFIG_OPROFILE=y
 # CONFIG_OSF_PARTITION is not set
 # CONFIG_P54_COMMON is not set
-# CONFIG_PANEL is not set
 # CONFIG_PARPORT_1284 is not set
 # CONFIG_PARPORT_AX88796 is not set
 # CONFIG_PATA_ARASAN_CF is not set
 # CONFIG_PERF_COUNTERS is not set
-# CONFIG_PHONE is not set
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_PL330_DMA=y
 # CONFIG_PMIC_ADP5520 is not set
@@ -300,12 +293,10 @@ CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIO_SERPORT=y
 # CONFIG_SGI_PARTITION is not set
 CONFIG_SLHC=m
-# CONFIG_SLIP is not set
 # CONFIG_SMC911X is not set
 # CONFIG_SMC91X is not set
 # CONFIG_SMSC911X is not set
 # CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_SOUND is not set
 # CONFIG_SPEAKUP_SYNTH_DUMMY is not set
 # CONFIG_SPI_ALTERA is not set
 # CONFIG_SPI_BITBANG is not set
@@ -320,7 +311,6 @@ CONFIG_SPI_PL022=y
 # CONFIG_SQUASHFS_LZO is not set
 # CONFIG_SQUASHFS_XATTR is not set
 # CONFIG_SQUASHFS_XZ is not set
-# CONFIG_SSB is not set
 # CONFIG_STAGING_MEDIA is not set
 CONFIG_STE10XP=m
 # CONFIG_STMMAC_ETH is not set
@@ -334,7 +324,6 @@ CONFIG_SWP_EMULATE=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_TEST_KSTRTOX is not set
-# CONFIG_THERMAL is not set
 # CONFIG_TIMB_DMA is not set
 # CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
 # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap
index db4f88bdac8..ac7d0f42fa2 100644
--- a/debian.master/config/armhf/config.flavour.omap
+++ b/debian.master/config/armhf/config.flavour.omap
@@ -23,6 +23,7 @@ CONFIG_B43=m
 CONFIG_B43LEGACY=m
 CONFIG_B44=m
 CONFIG_BATMAN_ADV=m
+CONFIG_BCH=y
 CONFIG_BCMA=m
 CONFIG_BCM_WIMAX=m
 CONFIG_BINARY_PRINTF=y
@@ -37,21 +38,16 @@ CONFIG_CFG80211_REG_DEBUG=y
 CONFIG_CGROUPS=y
 CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_CLEANCACHE=y
-CONFIG_CONNECTOR=y
 CONFIG_CORDIC=m
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_CPU_IDLE=y
 CONFIG_CRASH_DUMP=y
-CONFIG_CUSE=m
 CONFIG_DE600=m
 CONFIG_DE620=m
 CONFIG_DEBUG_KERNEL=y
 CONFIG_DEBUG_USER=y
 CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 CONFIG_DM9000=m
-CONFIG_DMA_SHARED_BUFFER=y
-CONFIG_DNET=m
-CONFIG_DRM=m
 CONFIG_DW_DMAC=m
 CONFIG_ECHO=m
 # CONFIG_ENABLE_MUST_CHECK is not set
@@ -65,31 +61,25 @@ CONFIG_FANOTIFY=y
 CONFIG_FB_ARMCLCD=m
 CONFIG_FB_BROADSHEET=m
 CONFIG_FB_METRONOME=m
-CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_S1D13XXX=m
 CONFIG_FB_SM7XX=m
 CONFIG_FB_SMSCUFX=m
 CONFIG_FB_UDL=m
 CONFIG_FONTS=y
 CONFIG_FPE_NWFPE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-CONFIG_FSCACHE=m
 CONFIG_FT1000=m
 CONFIG_FTRACE=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_HAMRADIO=y
 CONFIG_HIDRAW=y
 # CONFIG_HIGHMEM is not set
-CONFIG_HOSTAP=m
 CONFIG_HTC_EGPIO=y
 CONFIG_HTC_I2CPLD=y
 CONFIG_HTC_PASIC3=m
 CONFIG_HVC_DCC=y
-CONFIG_HW_RANDOM=y
 CONFIG_HZ=128
 CONFIG_I2C_DESIGNWARE_PLATFORM=m
 # CONFIG_I2C_HELPER_AUTO is not set
-CONFIG_IIO=m
 CONFIG_INLINE_READ_UNLOCK=y
 CONFIG_INLINE_READ_UNLOCK_IRQ=y
 CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
@@ -135,7 +125,6 @@ CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_THINFIRM=m
 CONFIG_LIBFC=m
 CONFIG_LIBFCOE=m
-CONFIG_LLC2=m
 CONFIG_LOGIG940_FF=y
 CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_LOGITECH_FF=y
@@ -147,7 +136,6 @@ CONFIG_MACVLAN=m
 CONFIG_MAC_PARTITION=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MEDIA_SUPPORT=m
-CONFIG_MEMSTICK=m
 CONFIG_MFD_88PM860X=y
 CONFIG_MFD_AAT2870_CORE=y
 CONFIG_MFD_ASIC3=y
@@ -175,7 +163,6 @@ CONFIG_MFD_WM8400=m
 CONFIG_MFD_WM8994=y
 CONFIG_MG_DISK=m
 CONFIG_MICREL_PHY=m
-CONFIG_MII=y
 CONFIG_MINIX_SUBPARTITION=y
 CONFIG_MMC_ARMMMCI=m
 CONFIG_MMC_DW=m
@@ -195,6 +182,14 @@ CONFIG_MOUSE_SERIAL=m
 CONFIG_MOUSE_SYNAPTICS_I2C=m
 CONFIG_MOUSE_VSXXXAA=m
 CONFIG_MTD=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_BCH=y
+CONFIG_MTD_NAND_ECC=y
+CONFIG_MTD_NAND_IDS=y
+CONFIG_MTD_OF_PARTS=y
 # CONFIG_MUSB_PIO_ONLY is not set
 # CONFIG_MUTEX_SPIN_ON_OWNER is not set
 CONFIG_MWIFIEX=m
@@ -215,12 +210,10 @@ CONFIG_OC_ETM=y
 CONFIG_OPROFILE=m
 CONFIG_OSF_PARTITION=y
 CONFIG_P54_COMMON=m
-CONFIG_PANEL=m
 CONFIG_PARPORT_1284=y
 CONFIG_PARPORT_AX88796=m
 CONFIG_PATA_ARASAN_CF=m
 CONFIG_PERF_COUNTERS=y
-CONFIG_PHONE=m
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_PL330_DMA=m
 CONFIG_PMIC_ADP5520=y
@@ -300,12 +293,10 @@ CONFIG_SERIO_RAW=m
 CONFIG_SERIO_SERPORT=m
 CONFIG_SGI_PARTITION=y
 CONFIG_SLHC=y
-CONFIG_SLIP=m
 CONFIG_SMC911X=m
 CONFIG_SMC91X=m
 CONFIG_SMSC911X=m
 CONFIG_SOLARIS_X86_PARTITION=y
-CONFIG_SOUND=m
 CONFIG_SPEAKUP_SYNTH_DUMMY=m
 CONFIG_SPI_ALTERA=m
 CONFIG_SPI_BITBANG=m
@@ -320,7 +311,6 @@ CONFIG_SPI_TLE62X0=m
 CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XATTR=y
 CONFIG_SQUASHFS_XZ=y
-CONFIG_SSB=m
 CONFIG_STAGING_MEDIA=y
 CONFIG_STE10XP=y
 CONFIG_STMMAC_ETH=m
@@ -334,7 +324,6 @@ CONFIG_TCG_TPM=y
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_MD5SIG=y
 CONFIG_TEST_KSTRTOX=m
-CONFIG_THERMAL=y
 CONFIG_TIMB_DMA=m
 CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
 CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index cc995acd85b..bfc0bb7c98c 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1014,6 +1014,7 @@ CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
 CONFIG_COMPAT_NETLINK_MESSAGES=y
 # CONFIG_COMPAT_VDSO is not set
 CONFIG_CONFIGFS_FS=m
+CONFIG_CONNECTOR=y
 CONFIG_CONSOLE_POLL=y
 CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_CONTEXT_SWITCH_TRACER=y
@@ -1183,6 +1184,7 @@ CONFIG_CRYSTALHD=m
 # CONFIG_CS5535_MFGPT is not set
 CONFIG_CS89x0=m
 CONFIG_CS89x0_PLATFORM=y
+CONFIG_CUSE=m
 CONFIG_CXT1E1=m
 CONFIG_CYCLADES=m
 CONFIG_CYCLADES_SYNC=m
@@ -1303,6 +1305,7 @@ CONFIG_DMAR_TABLE=y
 # CONFIG_DMATEST is not set
 # CONFIG_DMA_API_DEBUG is not set
 CONFIG_DMA_ENGINE=y
+CONFIG_DMA_SHARED_BUFFER=y
 CONFIG_DMI=y
 CONFIG_DMIID=y
 CONFIG_DMI_SYSFS=m
@@ -1325,6 +1328,7 @@ CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_UEVENT=y
 # CONFIG_DM_VERITY is not set
 CONFIG_DM_ZERO=m
+CONFIG_DNET=m
 CONFIG_DNOTIFY=y
 CONFIG_DNS_RESOLVER=y
 CONFIG_DONGLE=y
@@ -1332,6 +1336,7 @@ CONFIG_DOUBLEFAULT=y
 CONFIG_DQL=y
 CONFIG_DRAGONRISE_FF=y
 # CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_DRM=m
 CONFIG_DRM_GMA3600=y
 CONFIG_DRM_GMA500=m
 CONFIG_DRM_GMA600=y
@@ -1702,6 +1707,7 @@ CONFIG_FB_MB862XX=m
 CONFIG_FB_MB862XX_I2C=y
 # CONFIG_FB_MB862XX_LIME is not set
 CONFIG_FB_MB862XX_PCI_GDC=y
+CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_N411=m
 CONFIG_FB_NEOMAGIC=m
 CONFIG_FB_NVIDIA=m
@@ -1782,10 +1788,12 @@ CONFIG_FORCEDETH=m
 # CONFIG_FPE_FASTFPE is not set
 # CONFIG_FPE_NWFPE_XP is not set
 CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
 CONFIG_FRAME_POINTER=y
 CONFIG_FRAME_WARN=1024
 CONFIG_FREEZER=y
+CONFIG_FSCACHE=m
 # CONFIG_FSCACHE_DEBUG is not set
 CONFIG_FSCACHE_HISTOGRAM=y
 # CONFIG_FSCACHE_OBJECT_LIST is not set
@@ -2112,6 +2120,7 @@ CONFIG_HISAX_TELES_CS=m
 CONFIG_HISAX_W6692=y
 CONFIG_HMC6352=m
 CONFIG_HOLTEK_FF=y
+CONFIG_HOSTAP=m
 CONFIG_HOSTAP_CS=m
 CONFIG_HOSTAP_FIRMWARE=y
 CONFIG_HOSTAP_FIRMWARE_NVRAM=y
@@ -2168,6 +2177,7 @@ CONFIG_HWMON_VID=m
 # CONFIG_HWPOISON_INJECT is not set
 CONFIG_HW_CONSOLE=y
 CONFIG_HW_PERF_EVENTS=y
+CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_AMD=m
 CONFIG_HW_RANDOM_GEODE=m
 CONFIG_HW_RANDOM_INTEL=m
@@ -2299,6 +2309,7 @@ CONFIG_IFB=m
 CONFIG_IGB=m
 CONFIG_IGBVF=m
 CONFIG_IGB_DCA=y
+CONFIG_IIO=m
 CONFIG_IIO_BUFFER=y
 CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 CONFIG_IIO_GPIO_TRIGGER=m
@@ -2921,6 +2932,7 @@ CONFIG_LIS3L02DQ_BUF_KFIFO=y
 # CONFIG_LIS3L02DQ_BUF_RING_SW is not set
 CONFIG_LITELINK_DONGLE=m
 # CONFIG_LKDTM is not set
+CONFIG_LLC2=m
 CONFIG_LNE390=m
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
@@ -3075,6 +3087,7 @@ CONFIG_MEGARAID_SAS=m
 CONFIG_MEMORY_FAILURE=y
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMORY_HOTPLUG_SPARSE=y
+CONFIG_MEMSTICK=m
 # CONFIG_MEMSTICK_DEBUG is not set
 CONFIG_MEMSTICK_JMICRON_38X=m
 CONFIG_MEMSTICK_R592=m
@@ -3110,6 +3123,7 @@ CONFIG_MICROCODE_AMD=y
 CONFIG_MICROCODE_INTEL=y
 CONFIG_MICROCODE_OLD_INTERFACE=y
 CONFIG_MIGRATION=y
+CONFIG_MII=y
 CONFIG_MINIX_FS=m
 CONFIG_MISC_FILESYSTEMS=y
 CONFIG_MISDN=m
@@ -3770,6 +3784,7 @@ CONFIG_PACKET=y
 CONFIG_PADATA=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PANASONIC_LAPTOP=m
+CONFIG_PANEL=m
 CONFIG_PANEL_ACX565AKM=m
 # CONFIG_PANEL_CHANGE_MESSAGE is not set
 CONFIG_PANEL_DVI=y
@@ -3948,6 +3963,7 @@ CONFIG_PDC_ADMA=m
 CONFIG_PERF_EVENTS=y
 CONFIG_PERF_USE_VMALLOC=y
 CONFIG_PHANTOM=m
+CONFIG_PHONE=m
 CONFIG_PHONET=m
 CONFIG_PHONE_IXJ=m
 CONFIG_PHONE_IXJ_PCMCIA=m
@@ -4750,6 +4766,7 @@ CONFIG_SKY2=m
 # CONFIG_SLAB is not set
 CONFIG_SLABINFO=y
 CONFIG_SLICOSS=m
+CONFIG_SLIP=m
 CONFIG_SLIP_COMPRESSED=y
 CONFIG_SLIP_MODE_SLIP6=y
 CONFIG_SLIP_SMART=y
@@ -5108,6 +5125,7 @@ CONFIG_SOLO6X10=m
 CONFIG_SONYPI=m
 CONFIG_SONYPI_COMPAT=y
 CONFIG_SONY_LAPTOP=m
+CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE=y
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
 # CONFIG_SOUND_PRIME is not set
@@ -5155,6 +5173,7 @@ CONFIG_SQUASHFS=m
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 CONFIG_SQUASHFS_ZLIB=y
 CONFIG_SR_REPORT_TIME_LIMIT=100
+CONFIG_SSB=m
 CONFIG_SSB_B43_PCI_BRIDGE=y
 CONFIG_SSB_BLOCKIO=y
 # CONFIG_SSB_DEBUG is not set
@@ -5257,6 +5276,7 @@ CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_BM=m
 CONFIG_TEXTSEARCH_FSM=m
 CONFIG_TEXTSEARCH_KMP=m
+CONFIG_THERMAL=y
 CONFIG_THERMAL_HWMON=y
 CONFIG_THERM_ADT746X=y
 CONFIG_THERM_PM72=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 41331b4242d..58dd17c33ce 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -47,24 +47,19 @@ CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
 CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_CLEANCACHE=y
 CONFIG_COMPACTION=y
-CONFIG_CONNECTOR=y
 CONFIG_CORDIC=m
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_IDLE=y
 CONFIG_CRASH_DUMP=y
 CONFIG_CRYPTO_LZO=y
-CONFIG_CUSE=m
 CONFIG_DE600=m
 CONFIG_DE620=m
 CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_KERNEL=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
-CONFIG_DMA_SHARED_BUFFER=y
 CONFIG_DM_RAID45=m
-CONFIG_DNET=m
-CONFIG_DRM=m
 # CONFIG_DVB_FE_CUSTOMISE is not set
 # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
 CONFIG_ECHO=m
@@ -88,7 +83,6 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 CONFIG_FB_DDC=m
 # CONFIG_FB_MACMODES is not set
 CONFIG_FB_METRONOME=m
-CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_RADEON=m
 CONFIG_FB_S1D13XXX=m
 CONFIG_FB_SM7XX=m
@@ -103,8 +97,6 @@ CONFIG_FB_UDL=m
 CONFIG_FB_VOODOO1=m
 CONFIG_FIRMWARE_EDID=y
 # CONFIG_FONTS is not set
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-CONFIG_FSCACHE=m
 CONFIG_FT1000=m
 CONFIG_FTRACE=y
 CONFIG_FUNCTION_TRACER=y
@@ -117,16 +109,13 @@ CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
 CONFIG_HIDRAW=y
 CONFIG_HIGHMEM=y
-CONFIG_HOSTAP=m
 CONFIG_HTC_I2CPLD=y
 CONFIG_HTC_PASIC3=m
 CONFIG_HUGETLB_PAGE=y
-CONFIG_HW_RANDOM=y
 CONFIG_HZ=250
 CONFIG_I2C_ALGOBIT=m
 # CONFIG_I2C_HELPER_AUTO is not set
 # CONFIG_IDE is not set
-CONFIG_IIO=m
 CONFIG_ILLEGAL_POINTER_VALUE=0
 CONFIG_INLINE_READ_UNLOCK=y
 CONFIG_INLINE_READ_UNLOCK_IRQ=y
@@ -183,7 +172,6 @@ CONFIG_LIBFCOE=m
 CONFIG_LIBIPW_DEBUG=y
 CONFIG_LIS3L02DQ=m
 CONFIG_LLC=y
-CONFIG_LLC2=m
 CONFIG_LOGIG940_FF=y
 CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_LOGITECH_FF=y
@@ -197,7 +185,6 @@ CONFIG_MAC_PARTITION=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAX_RAW_DEVS=256
 CONFIG_MEDIA_SUPPORT=m
-CONFIG_MEMSTICK=m
 CONFIG_MFD_88PM860X=y
 CONFIG_MFD_AAT2870_CORE=y
 CONFIG_MFD_MAX8925=y
@@ -220,7 +207,6 @@ CONFIG_MFD_WM8350_I2C=y
 CONFIG_MFD_WM8400=m
 CONFIG_MFD_WM8994=y
 CONFIG_MICREL_PHY=m
-CONFIG_MII=y
 CONFIG_MINIX_SUBPARTITION=y
 CONFIG_MMC_BLOCK=m
 CONFIG_MMC_SDHCI=m
@@ -272,7 +258,6 @@ CONFIG_OSF_PARTITION=y
 CONFIG_OUTPUT_FORMAT="elf32-i386"
 CONFIG_P54_COMMON=m
 CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_PANEL=m
 CONFIG_PARPORT_1284=y
 CONFIG_PARPORT_AX88796=m
 CONFIG_PARPORT_PC=m
@@ -280,7 +265,6 @@ CONFIG_PATA_ARASAN_CF=m
 CONFIG_PATA_SIS=y
 CONFIG_PCCARD=m
 CONFIG_PERF_COUNTERS=y
-CONFIG_PHONE=m
 CONFIG_PHYSICAL_START=0x1000000
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_PMIC_ADP5520=y
@@ -370,14 +354,12 @@ CONFIG_SERIO_RAW=m
 CONFIG_SERIO_SERPORT=m
 CONFIG_SGI_PARTITION=y
 CONFIG_SLHC=y
-CONFIG_SLIP=m
 # CONFIG_SND_BT87X_OVERCLOCK is not set
 CONFIG_SND_EMU10K1_SEQ=m
 CONFIG_SND_OPL3_LIB_SEQ=m
 CONFIG_SND_OPL4_LIB_SEQ=m
 CONFIG_SND_SBAWE_SEQ=m
 CONFIG_SOLARIS_X86_PARTITION=y
-CONFIG_SOUND=m
 # CONFIG_SPARSEMEM_MANUAL is not set
 CONFIG_SPEAKUP_SYNTH_DUMMY=m
 CONFIG_SPI_ALTERA=m
@@ -393,7 +375,6 @@ CONFIG_SPI_TLE62X0=m
 CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XATTR=y
 CONFIG_SQUASHFS_XZ=y
-CONFIG_SSB=m
 # CONFIG_SSB_PCMCIAHOST is not set
 CONFIG_STACK_TRACER=y
 CONFIG_STAGING_MEDIA=y
@@ -410,7 +391,6 @@ CONFIG_TCG_TPM=y
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_MD5SIG=y
 CONFIG_TEST_KSTRTOX=m
-CONFIG_THERMAL=y
 CONFIG_TIMB_DMA=m
 CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
 CONFIG_TOUCHSCREEN_EETI=m
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 9d45c6180a3..b66113302e5 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -42,23 +42,18 @@ CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
 CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_CLEANCACHE=y
 # CONFIG_COMPACTION is not set
-CONFIG_CONNECTOR=y
 CONFIG_CORDIC=m
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_CPU_FREQ_STAT=m
 CONFIG_CPU_IDLE=y
 CONFIG_CRYPTO_LZO=m
-CONFIG_CUSE=m
 CONFIG_DE600=m
 CONFIG_DE620=m
 # CONFIG_DEBUG_INFO is not set
 CONFIG_DEBUG_KERNEL=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
-CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_DM_RAID45 is not set
-CONFIG_DNET=m
-CONFIG_DRM=m
 # CONFIG_DVB_FE_CUSTOMISE is not set
 CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
 CONFIG_ECHO=m
@@ -82,7 +77,6 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 CONFIG_FB_DDC=y
 CONFIG_FB_MACMODES=y
 CONFIG_FB_METRONOME=m
-CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_RADEON=y
 CONFIG_FB_S1D13XXX=m
 CONFIG_FB_SM7XX=m
@@ -93,8 +87,6 @@ CONFIG_FB_UDL=m
 CONFIG_FB_VOODOO1=y
 CONFIG_FIRMWARE_EDID=y
 # CONFIG_FONTS is not set
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-CONFIG_FSCACHE=m
 CONFIG_FT1000=m
 CONFIG_FTRACE=y
 CONFIG_FUNCTION_TRACER=y
@@ -107,17 +99,14 @@ CONFIG_HAMRADIO=y
 # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
 CONFIG_HIDRAW=y
 CONFIG_HIGHMEM=y
-CONFIG_HOSTAP=m
 CONFIG_HTC_I2CPLD=y
 CONFIG_HTC_PASIC3=m
 # CONFIG_HVC_CONSOLE is not set
-CONFIG_HW_RANDOM=y
 CONFIG_HZ=250
 CONFIG_I2C_ALGOBIT=y
 CONFIG_I2C_HELPER_AUTO=y
 # CONFIG_IBMEBUS is not set
 # CONFIG_IDE is not set
-CONFIG_IIO=m
 CONFIG_INLINE_READ_UNLOCK=y
 CONFIG_INLINE_READ_UNLOCK_IRQ=y
 CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
@@ -170,7 +159,6 @@ CONFIG_LIBFCOE=m
 # CONFIG_LIBIPW_DEBUG is not set
 CONFIG_LIS3L02DQ=m
 CONFIG_LLC=y
-CONFIG_LLC2=m
 CONFIG_LOGIG940_FF=y
 CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_LOGITECH_FF=y
@@ -186,7 +174,6 @@ CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAX_RAW_DEVS=256
 CONFIG_MEDIA_SUPPORT=m
 # CONFIG_MEMORY_HOTREMOVE is not set
-CONFIG_MEMSTICK=m
 CONFIG_MFD_88PM860X=y
 CONFIG_MFD_AAT2870_CORE=y
 CONFIG_MFD_MAX8925=y
@@ -209,7 +196,6 @@ CONFIG_MFD_WM8350_I2C=y
 CONFIG_MFD_WM8400=m
 CONFIG_MFD_WM8994=y
 CONFIG_MICREL_PHY=m
-CONFIG_MII=y
 CONFIG_MINIX_SUBPARTITION=y
 CONFIG_MMC_BLOCK=m
 CONFIG_MMC_SDHCI=m
@@ -258,7 +244,6 @@ CONFIG_NVRAM=y
 CONFIG_OPROFILE=m
 CONFIG_OSF_PARTITION=y
 CONFIG_P54_COMMON=m
-CONFIG_PANEL=m
 CONFIG_PARPORT_1284=y
 CONFIG_PARPORT_AX88796=m
 CONFIG_PARPORT_PC=m
@@ -267,7 +252,6 @@ CONFIG_PATA_SIS=m
 CONFIG_PCCARD=m
 CONFIG_PCI_SYSCALL=y
 CONFIG_PERF_COUNTERS=y
-CONFIG_PHONE=m
 CONFIG_PHYSICAL_START=0x00000000
 CONFIG_PMIC_ADP5520=y
 CONFIG_PMIC_DA903X=y
@@ -360,14 +344,12 @@ CONFIG_SERIO_RAW=m
 CONFIG_SERIO_SERPORT=m
 CONFIG_SGI_PARTITION=y
 CONFIG_SLHC=y
-CONFIG_SLIP=m
 CONFIG_SND_BT87X_OVERCLOCK=y
 CONFIG_SND_EMU10K1_SEQ=m
 CONFIG_SND_OPL3_LIB_SEQ=m
 # CONFIG_SND_OPL4_LIB_SEQ is not set
 # CONFIG_SND_SBAWE_SEQ is not set
 CONFIG_SOLARIS_X86_PARTITION=y
-CONFIG_SOUND=m
 CONFIG_SPARSEMEM_MANUAL=y
 CONFIG_SPEAKUP_SYNTH_DUMMY=m
 CONFIG_SPI_ALTERA=m
@@ -383,7 +365,6 @@ CONFIG_SPI_TLE62X0=m
 CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XATTR=y
 CONFIG_SQUASHFS_XZ=y
-CONFIG_SSB=m
 # CONFIG_SSB_PCMCIAHOST is not set
 # CONFIG_STACK_TRACER is not set
 CONFIG_STAGING_MEDIA=y
@@ -400,7 +381,6 @@ CONFIG_TCG_TPM=y
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_MD5SIG=y
 CONFIG_TEST_KSTRTOX=m
-CONFIG_THERMAL=y
 CONFIG_TIMB_DMA=m
 CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
 CONFIG_TOUCHSCREEN_EETI=m
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index eb14831d6df..1ebe2839d57 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -46,24 +46,19 @@ CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
 CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_CLEANCACHE=y
 CONFIG_COMPACTION=y
-CONFIG_CONNECTOR=y
 CONFIG_CORDIC=m
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_CPU_FREQ_STAT=m
 CONFIG_CPU_IDLE=y
 CONFIG_CRASH_DUMP=y
 CONFIG_CRYPTO_LZO=m
-CONFIG_CUSE=m
 CONFIG_DE600=m
 CONFIG_DE620=m
 # CONFIG_DEBUG_INFO is not set
 CONFIG_DEBUG_KERNEL=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
-CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_DM_RAID45 is not set
-CONFIG_DNET=m
-CONFIG_DRM=m
 # CONFIG_DVB_FE_CUSTOMISE is not set
 CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
 CONFIG_ECHO=m
@@ -87,7 +82,6 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 CONFIG_FB_DDC=y
 CONFIG_FB_MACMODES=y
 CONFIG_FB_METRONOME=m
-CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_RADEON=y
 CONFIG_FB_S1D13XXX=m
 CONFIG_FB_SM7XX=m
@@ -103,8 +97,6 @@ CONFIG_FB_VOODOO1=y
 CONFIG_FIRMWARE_EDID=y
 # CONFIG_FONTS is not set
 CONFIG_FORCE_MAX_ZONEORDER=9
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-CONFIG_FSCACHE=m
 CONFIG_FT1000=m
 CONFIG_FTRACE=y
 CONFIG_FUNCTION_TRACER=y
@@ -117,18 +109,15 @@ CONFIG_HAMRADIO=y
 # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
 CONFIG_HIDRAW=y
-CONFIG_HOSTAP=m
 CONFIG_HTC_I2CPLD=y
 CONFIG_HTC_PASIC3=m
 CONFIG_HUGETLB_PAGE=y
 CONFIG_HVC_CONSOLE=y
-CONFIG_HW_RANDOM=y
 CONFIG_HZ=250
 CONFIG_I2C_ALGOBIT=y
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_IBMEBUS=y
 CONFIG_IDE=y
-CONFIG_IIO=m
 CONFIG_INLINE_READ_UNLOCK=y
 CONFIG_INLINE_READ_UNLOCK_IRQ=y
 CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
@@ -183,7 +172,6 @@ CONFIG_LIBFCOE=m
 # CONFIG_LIBIPW_DEBUG is not set
 CONFIG_LIS3L02DQ=m
 CONFIG_LLC=y
-CONFIG_LLC2=m
 CONFIG_LOGIG940_FF=y
 CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_LOGITECH_FF=y
@@ -200,7 +188,6 @@ CONFIG_MAX_ACTIVE_REGIONS=256
 CONFIG_MAX_RAW_DEVS=8192
 CONFIG_MEDIA_SUPPORT=m
 CONFIG_MEMORY_HOTREMOVE=y
-CONFIG_MEMSTICK=m
 CONFIG_MFD_88PM860X=y
 CONFIG_MFD_AAT2870_CORE=y
 CONFIG_MFD_MAX8925=y
@@ -223,7 +210,6 @@ CONFIG_MFD_WM8350_I2C=y
 CONFIG_MFD_WM8400=m
 CONFIG_MFD_WM8994=y
 CONFIG_MICREL_PHY=m
-CONFIG_MII=y
 CONFIG_MINIX_SUBPARTITION=y
 CONFIG_MMC_BLOCK=m
 CONFIG_MMC_SDHCI=m
@@ -278,7 +264,6 @@ CONFIG_OPROFILE=m
 CONFIG_OSF_PARTITION=y
 CONFIG_P54_COMMON=m
 CONFIG_PAGE_OFFSET=0xc000000000000000
-CONFIG_PANEL=m
 CONFIG_PARPORT_1284=y
 CONFIG_PARPORT_AX88796=m
 CONFIG_PARPORT_PC=m
@@ -287,7 +272,6 @@ CONFIG_PATA_SIS=m
 CONFIG_PCCARD=m
 CONFIG_PCI_SYSCALL=y
 CONFIG_PERF_COUNTERS=y
-CONFIG_PHONE=m
 CONFIG_PHYSICAL_START=0x00000000
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_PMIC_ADP5520=y
@@ -394,14 +378,12 @@ CONFIG_SERIO_RAW=m
 CONFIG_SERIO_SERPORT=m
 CONFIG_SGI_PARTITION=y
 CONFIG_SLHC=y
-CONFIG_SLIP=m
 CONFIG_SND_BT87X_OVERCLOCK=y
 CONFIG_SND_EMU10K1_SEQ=m
 CONFIG_SND_OPL3_LIB_SEQ=m
 # CONFIG_SND_OPL4_LIB_SEQ is not set
 # CONFIG_SND_SBAWE_SEQ is not set
 CONFIG_SOLARIS_X86_PARTITION=y
-CONFIG_SOUND=m
 CONFIG_SPARSEMEM_MANUAL=y
 CONFIG_SPEAKUP_SYNTH_DUMMY=m
 CONFIG_SPI_ALTERA=m
@@ -417,7 +399,6 @@ CONFIG_SPI_TLE62X0=m
 CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XATTR=y
 CONFIG_SQUASHFS_XZ=y
-CONFIG_SSB=m
 CONFIG_SSB_PCMCIAHOST=y
 # CONFIG_STACK_TRACER is not set
 CONFIG_STAGING_MEDIA=y
@@ -434,7 +415,6 @@ CONFIG_TCG_TPM=y
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_MD5SIG=y
 CONFIG_TEST_KSTRTOX=m
-CONFIG_THERMAL=y
 CONFIG_TIMB_DMA=m
 CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
 CONFIG_TOUCHSCREEN_EETI=m