diff options
| -rw-r--r-- | debian.master/config/amd64/config.common.amd64 | 18 | ||||
| -rw-r--r-- | debian.master/config/armel/config.common.armel | 20 | ||||
| -rw-r--r-- | debian.master/config/armhf/config.flavour.highbank | 20 | ||||
| -rw-r--r-- | debian.master/config/armhf/config.flavour.omap | 20 | ||||
| -rw-r--r-- | debian.master/config/config.common.ubuntu | 20 | ||||
| -rw-r--r-- | debian.master/config/i386/config.common.i386 | 18 | ||||
| -rw-r--r-- | debian.master/config/powerpc/config.common.powerpc | 18 | ||||
| -rw-r--r-- | debian.master/config/ppc64/config.common.ppc64 | 18 |
8 files changed, 20 insertions, 132 deletions
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index ae786a8cbbe..db20ae35b7c 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -132,22 +132,16 @@ CONFIG_LOGITECH_FF=y CONFIG_LOGIWHEELS_FF=y CONFIG_LOG_BUF_SHIFT=18 CONFIG_MAC80211_DEBUG_MENU=y -CONFIG_MAC80211_HWSIM=m CONFIG_MAC80211_MESH=y -CONFIG_MACVLAN=m CONFIG_MAC_PARTITION=y CONFIG_MAGIC_SYSRQ=y CONFIG_MAX_RAW_DEVS=256 -CONFIG_MEDIA_SUPPORT=m CONFIG_MEMORY_HOTREMOVE=y CONFIG_MFD_88PM860X=y CONFIG_MFD_AAT2870_CORE=y CONFIG_MFD_MAX8925=y CONFIG_MFD_MAX8997=y CONFIG_MFD_MAX8998=y -CONFIG_MFD_MC13XXX=m -CONFIG_MFD_PCF50633=m -CONFIG_MFD_SM501=m CONFIG_MFD_STMPE=y CONFIG_MFD_TC3589X=y # CONFIG_MFD_TMIO is not set @@ -155,29 +149,19 @@ CONFIG_MFD_TPS6586X=y CONFIG_MFD_TPS65910=y CONFIG_MFD_TPS65912_I2C=y CONFIG_MFD_TPS65912_SPI=y -CONFIG_MFD_WL1273_CORE=m CONFIG_MFD_WM831X_I2C=y CONFIG_MFD_WM831X_SPI=y CONFIG_MFD_WM8350_I2C=y -CONFIG_MFD_WM8400=m CONFIG_MFD_WM8994=y CONFIG_MICREL_PHY=m CONFIG_MINIX_SUBPARTITION=y CONFIG_MMC_BLOCK=m CONFIG_MMC_SDHCI=m CONFIG_MMC_SDHCI_PLTFM=m -CONFIG_MMC_USHC=m -CONFIG_MMC_VUB300=m CONFIG_MODULE_SRCVERSION_ALL=y CONFIG_MODVERSIONS=y -CONFIG_MOUSE_APPLETOUCH=m -CONFIG_MOUSE_BCM5974=m -CONFIG_MOUSE_GPIO=m CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_PS2_SENTELIC=y -CONFIG_MOUSE_SERIAL=m -CONFIG_MOUSE_SYNAPTICS_I2C=m -CONFIG_MOUSE_VSXXXAA=m CONFIG_MTD=m CONFIG_MTD_BLKDEVS=m CONFIG_MTD_BLOCK=m @@ -189,7 +173,6 @@ CONFIG_MTD_NAND_IDS=m CONFIG_MTD_SM_COMMON=m CONFIG_MUSB_PIO_ONLY=y CONFIG_MUTEX_SPIN_ON_OWNER=y -CONFIG_MWIFIEX=m CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y CONFIG_NETCONSOLE=m @@ -343,7 +326,6 @@ CONFIG_TCG_TPM=y CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_MD5SIG=y CONFIG_TEST_KSTRTOX=m -CONFIG_TIMB_DMA=m CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m CONFIG_TOUCHSCREEN_EETI=m CONFIG_TOUCHSCREEN_EGALAX=m diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index fa9c0d27941..60da4bdc8f7 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -133,22 +133,16 @@ CONFIG_LOGITECH_FF=y CONFIG_LOGIWHEELS_FF=y CONFIG_LOG_BUF_SHIFT=17 CONFIG_MAC80211_DEBUG_MENU=y -CONFIG_MAC80211_HWSIM=m CONFIG_MAC80211_MESH=y -CONFIG_MACVLAN=m CONFIG_MAC_PARTITION=y CONFIG_MAGIC_SYSRQ=y CONFIG_MAX_RAW_DEVS=256 -CONFIG_MEDIA_SUPPORT=m CONFIG_MFD_88PM860X=y CONFIG_MFD_AAT2870_CORE=y CONFIG_MFD_ASIC3=y CONFIG_MFD_MAX8925=y CONFIG_MFD_MAX8997=y CONFIG_MFD_MAX8998=y -CONFIG_MFD_MC13XXX=m -CONFIG_MFD_PCF50633=m -CONFIG_MFD_SM501=m CONFIG_MFD_STMPE=y CONFIG_MFD_T7L66XB=y CONFIG_MFD_TC3589X=y @@ -159,34 +153,22 @@ CONFIG_MFD_TPS6586X=y CONFIG_MFD_TPS65910=y CONFIG_MFD_TPS65912_I2C=y CONFIG_MFD_TPS65912_SPI=y -CONFIG_MFD_WL1273_CORE=m CONFIG_MFD_WM831X_I2C=y CONFIG_MFD_WM831X_SPI=y CONFIG_MFD_WM8350_I2C=y -CONFIG_MFD_WM8400=m CONFIG_MFD_WM8994=y -CONFIG_MG_DISK=m CONFIG_MICREL_PHY=m CONFIG_MINIX_SUBPARTITION=y CONFIG_MMC_ARMMMCI=m CONFIG_MMC_BLOCK=y -CONFIG_MMC_DW=m CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=m CONFIG_MMC_SDHCI_PXAV2=m CONFIG_MMC_SDHCI_PXAV3=m -CONFIG_MMC_USHC=m -CONFIG_MMC_VUB300=m CONFIG_MODULE_SRCVERSION_ALL=y CONFIG_MODVERSIONS=y -CONFIG_MOUSE_APPLETOUCH=m -CONFIG_MOUSE_BCM5974=m -CONFIG_MOUSE_GPIO=m CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_PS2_SENTELIC=y -CONFIG_MOUSE_SERIAL=m -CONFIG_MOUSE_SYNAPTICS_I2C=m -CONFIG_MOUSE_VSXXXAA=m CONFIG_MTD=y CONFIG_MTD_BLKDEVS=y CONFIG_MTD_BLOCK=y @@ -199,7 +181,6 @@ CONFIG_MTD_OF_PARTS=y # CONFIG_MTD_SM_COMMON is not set # CONFIG_MUSB_PIO_ONLY is not set # CONFIG_MUTEX_SPIN_ON_OWNER is not set -CONFIG_MWIFIEX=m CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NETCONSOLE=m CONFIG_NETPOLL=y @@ -353,7 +334,6 @@ CONFIG_TCG_TPM=y CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_MD5SIG=y CONFIG_TEST_KSTRTOX=m -CONFIG_TIMB_DMA=m CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m # CONFIG_TOUCHSCREEN_EETI is not set # CONFIG_TOUCHSCREEN_EGALAX is not set diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank index 6d42e69e001..08fc1347ca9 100644 --- a/debian.master/config/armhf/config.flavour.highbank +++ b/debian.master/config/armhf/config.flavour.highbank @@ -84,21 +84,15 @@ CONFIG_LEGACY_PTY_COUNT=256 # CONFIG_LOGITECH_FF is not set # CONFIG_LOGIWHEELS_FF is not set # CONFIG_MAC80211_DEBUG_MENU is not set -# CONFIG_MAC80211_HWSIM is not set # CONFIG_MAC80211_MESH is not set -# CONFIG_MACVLAN is not set # CONFIG_MAC_PARTITION is not set # CONFIG_MAGIC_SYSRQ is not set -# CONFIG_MEDIA_SUPPORT is not set # CONFIG_MFD_88PM860X is not set # CONFIG_MFD_AAT2870_CORE is not set # CONFIG_MFD_ASIC3 is not set # CONFIG_MFD_MAX8925 is not set # CONFIG_MFD_MAX8997 is not set # CONFIG_MFD_MAX8998 is not set -# CONFIG_MFD_MC13XXX is not set -# CONFIG_MFD_PCF50633 is not set -# CONFIG_MFD_SM501 is not set # CONFIG_MFD_STMPE is not set # CONFIG_MFD_T7L66XB is not set # CONFIG_MFD_TC3589X is not set @@ -109,32 +103,20 @@ CONFIG_LEGACY_PTY_COUNT=256 # CONFIG_MFD_TPS65910 is not set # CONFIG_MFD_TPS65912_I2C is not set # CONFIG_MFD_TPS65912_SPI is not set -# CONFIG_MFD_WL1273_CORE 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_WM8400 is not set # CONFIG_MFD_WM8994 is not set -# CONFIG_MG_DISK is not set CONFIG_MICREL_PHY=y # CONFIG_MINIX_SUBPARTITION is not set # CONFIG_MMC_ARMMMCI is not set -# CONFIG_MMC_DW is not set CONFIG_MMC_SDHCI_PLTFM=y # CONFIG_MMC_SDHCI_PXAV2 is not set # CONFIG_MMC_SDHCI_PXAV3 is not set -# CONFIG_MMC_USHC is not set -# CONFIG_MMC_VUB300 is not set # CONFIG_MODULE_SRCVERSION_ALL is not set # CONFIG_MODVERSIONS is not set -# CONFIG_MOUSE_APPLETOUCH is not set -# CONFIG_MOUSE_BCM5974 is not set -# CONFIG_MOUSE_GPIO is not set # CONFIG_MOUSE_PS2_ELANTECH is not set # CONFIG_MOUSE_PS2_SENTELIC is not set -# CONFIG_MOUSE_SERIAL is not set -# CONFIG_MOUSE_SYNAPTICS_I2C is not set -# CONFIG_MOUSE_VSXXXAA is not set CONFIG_MTD=m CONFIG_MTD_BLKDEVS=m CONFIG_MTD_BLOCK=m @@ -146,7 +128,6 @@ 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 # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set CONFIG_NET_CALXEDA_XGMAC=y @@ -275,7 +256,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_TIMB_DMA is not set # CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set # CONFIG_TOUCHSCREEN_W90X900 is not set diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap index 76234bc8c58..9b04f36ebba 100644 --- a/debian.master/config/armhf/config.flavour.omap +++ b/debian.master/config/armhf/config.flavour.omap @@ -84,21 +84,15 @@ CONFIG_LOGIRUMBLEPAD2_FF=y CONFIG_LOGITECH_FF=y CONFIG_LOGIWHEELS_FF=y CONFIG_MAC80211_DEBUG_MENU=y -CONFIG_MAC80211_HWSIM=m CONFIG_MAC80211_MESH=y -CONFIG_MACVLAN=m CONFIG_MAC_PARTITION=y CONFIG_MAGIC_SYSRQ=y -CONFIG_MEDIA_SUPPORT=m CONFIG_MFD_88PM860X=y CONFIG_MFD_AAT2870_CORE=y CONFIG_MFD_ASIC3=y CONFIG_MFD_MAX8925=y CONFIG_MFD_MAX8997=y CONFIG_MFD_MAX8998=y -CONFIG_MFD_MC13XXX=m -CONFIG_MFD_PCF50633=m -CONFIG_MFD_SM501=m CONFIG_MFD_STMPE=y CONFIG_MFD_T7L66XB=y CONFIG_MFD_TC3589X=y @@ -109,32 +103,20 @@ CONFIG_MFD_TPS6586X=y CONFIG_MFD_TPS65910=y CONFIG_MFD_TPS65912_I2C=y CONFIG_MFD_TPS65912_SPI=y -CONFIG_MFD_WL1273_CORE=m CONFIG_MFD_WM831X_I2C=y CONFIG_MFD_WM831X_SPI=y CONFIG_MFD_WM8350_I2C=y -CONFIG_MFD_WM8400=m CONFIG_MFD_WM8994=y -CONFIG_MG_DISK=m CONFIG_MICREL_PHY=m CONFIG_MINIX_SUBPARTITION=y CONFIG_MMC_ARMMMCI=m -CONFIG_MMC_DW=m CONFIG_MMC_SDHCI_PLTFM=m CONFIG_MMC_SDHCI_PXAV2=m CONFIG_MMC_SDHCI_PXAV3=m -CONFIG_MMC_USHC=m -CONFIG_MMC_VUB300=m CONFIG_MODULE_SRCVERSION_ALL=y CONFIG_MODVERSIONS=y -CONFIG_MOUSE_APPLETOUCH=m -CONFIG_MOUSE_BCM5974=m -CONFIG_MOUSE_GPIO=m CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_PS2_SENTELIC=y -CONFIG_MOUSE_SERIAL=m -CONFIG_MOUSE_SYNAPTICS_I2C=m -CONFIG_MOUSE_VSXXXAA=m CONFIG_MTD=y CONFIG_MTD_BLKDEVS=y CONFIG_MTD_BLOCK=y @@ -146,7 +128,6 @@ 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 CONFIG_NETCONSOLE=m CONFIG_NETPOLL=y CONFIG_NET_CALXEDA_XGMAC=m @@ -275,7 +256,6 @@ CONFIG_TCG_TPM=y CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_MD5SIG=y CONFIG_TEST_KSTRTOX=m -CONFIG_TIMB_DMA=m CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m CONFIG_TOUCHSCREEN_W90X900=m diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 65abefd76d4..b3d3e44ecf6 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -3015,6 +3015,7 @@ CONFIG_MAC80211_DEBUGFS=y # CONFIG_MAC80211_DEBUG_COUNTERS is not set CONFIG_MAC80211_HAS_RC=y # CONFIG_MAC80211_HT_DEBUG is not set +CONFIG_MAC80211_HWSIM=m # CONFIG_MAC80211_IBSS_DEBUG is not set CONFIG_MAC80211_LEDS=y # CONFIG_MAC80211_NOINLINE is not set @@ -3060,6 +3061,7 @@ CONFIG_MACH_SBC3530=y CONFIG_MACH_TI8148EVM=y CONFIG_MACH_TI8168EVM=y CONFIG_MACINTOSH_DRIVERS=y +CONFIG_MACVLAN=m CONFIG_MACVTAP=m CONFIG_MAC_EMUMOUSEBTN=m CONFIG_MAC_FLOPPY=m @@ -3099,6 +3101,7 @@ CONFIG_MD_RAID456=m CONFIG_MEDIA_ALTERA_CI=m CONFIG_MEDIA_ATTACH=y # CONFIG_MEDIA_CONTROLLER is not set +CONFIG_MEDIA_SUPPORT=m CONFIG_MEDIA_TUNER=m # CONFIG_MEDIA_TUNER_CUSTOMISE is not set CONFIG_MEDIA_TUNER_MAX2165=m @@ -3147,10 +3150,13 @@ CONFIG_MFD_DA9052_SPI=y CONFIG_MFD_INTEL_MSIC=y CONFIG_MFD_JANZ_CMODIO=m CONFIG_MFD_MC13783=m +CONFIG_MFD_MC13XXX=m # CONFIG_MFD_OMAP_USB_HOST is not set +CONFIG_MFD_PCF50633=m CONFIG_MFD_RC5T583=y CONFIG_MFD_RDC321X=m CONFIG_MFD_S5M_CORE=y +CONFIG_MFD_SM501=m # CONFIG_MFD_SM501_GPIO is not set CONFIG_MFD_TIMBERDALE=m CONFIG_MFD_TPS65090=y @@ -3158,10 +3164,13 @@ CONFIG_MFD_TPS65217=m CONFIG_MFD_TPS65912=y CONFIG_MFD_TWL4030_AUDIO=y CONFIG_MFD_VX855=m +CONFIG_MFD_WL1273_CORE=m CONFIG_MFD_WM831X=y CONFIG_MFD_WM8350=y +CONFIG_MFD_WM8400=m # CONFIG_MGEODEGX1 is not set # CONFIG_MGEODE_LX is not set +CONFIG_MG_DISK=m CONFIG_MG_DISK_RES=0 CONFIG_MICREL_KS8995MA=m CONFIG_MICROCODE=m @@ -3200,6 +3209,7 @@ CONFIG_MMC_BLOCK_MINORS=8 CONFIG_MMC_CB710=m # CONFIG_MMC_CLKGATE is not set # CONFIG_MMC_DEBUG is not set +CONFIG_MMC_DW=m # CONFIG_MMC_DW_IDMAC is not set CONFIG_MMC_DW_PLTFM=m CONFIG_MMC_OMAP=m @@ -3217,7 +3227,9 @@ CONFIG_MMC_TIFM_SD=m CONFIG_MMC_TMIO=m CONFIG_MMC_TMIO_CORE=m # CONFIG_MMC_UNSAFE_RESUME is not set +CONFIG_MMC_USHC=m CONFIG_MMC_VIA_SDMMC=m +CONFIG_MMC_VUB300=m CONFIG_MMC_WBSD=m CONFIG_MMIOTRACE=y # CONFIG_MMIOTRACE_TEST is not set @@ -3228,7 +3240,10 @@ CONFIG_MODULES=y # CONFIG_MODULE_FORCE_LOAD is not set # CONFIG_MODULE_FORCE_UNLOAD is not set CONFIG_MODULE_UNLOAD=y +CONFIG_MOUSE_APPLETOUCH=m # CONFIG_MOUSE_ATIXL is not set +CONFIG_MOUSE_BCM5974=m +CONFIG_MOUSE_GPIO=m CONFIG_MOUSE_INPORT=m CONFIG_MOUSE_LOGIBM=m CONFIG_MOUSE_PC110PAD=m @@ -3239,7 +3254,10 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y # CONFIG_MOUSE_PS2_TOUCHKIT is not set CONFIG_MOUSE_PS2_TRACKPOINT=y +CONFIG_MOUSE_SERIAL=m +CONFIG_MOUSE_SYNAPTICS_I2C=m CONFIG_MOUSE_SYNAPTICS_USB=m +CONFIG_MOUSE_VSXXXAA=m CONFIG_MOXA_INTELLIO=m CONFIG_MOXA_SMARTIO=m # CONFIG_MPENTIUM4 is not set @@ -3382,6 +3400,7 @@ CONFIG_MV643XX_ETH=m # CONFIG_MVIAC3_2 is not set # CONFIG_MVIAC7 is not set CONFIG_MWAVE=m +CONFIG_MWIFIEX=m CONFIG_MWIFIEX_PCIE=m CONFIG_MWIFIEX_SDIO=m # CONFIG_MWINCHIP3D is not set @@ -5344,6 +5363,7 @@ CONFIG_TICK_ONESHOT=y CONFIG_TIFM_7XX1=m CONFIG_TIFM_CORE=m CONFIG_TIGON3=m +CONFIG_TIMB_DMA=m CONFIG_TIMERFD=y CONFIG_TIMER_STATS=y CONFIG_TINY_RCU=y diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index e42ab24d8e2..cf4f3f03e0c 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -133,21 +133,15 @@ CONFIG_LOGITECH_FF=y CONFIG_LOGIWHEELS_FF=y CONFIG_LOG_BUF_SHIFT=17 CONFIG_MAC80211_DEBUG_MENU=y -CONFIG_MAC80211_HWSIM=m CONFIG_MAC80211_MESH=y -CONFIG_MACVLAN=m CONFIG_MAC_PARTITION=y CONFIG_MAGIC_SYSRQ=y CONFIG_MAX_RAW_DEVS=256 -CONFIG_MEDIA_SUPPORT=m CONFIG_MFD_88PM860X=y CONFIG_MFD_AAT2870_CORE=y CONFIG_MFD_MAX8925=y CONFIG_MFD_MAX8997=y CONFIG_MFD_MAX8998=y -CONFIG_MFD_MC13XXX=m -CONFIG_MFD_PCF50633=m -CONFIG_MFD_SM501=m CONFIG_MFD_STMPE=y CONFIG_MFD_TC3589X=y # CONFIG_MFD_TMIO is not set @@ -155,29 +149,19 @@ CONFIG_MFD_TPS6586X=y CONFIG_MFD_TPS65910=y CONFIG_MFD_TPS65912_I2C=y CONFIG_MFD_TPS65912_SPI=y -CONFIG_MFD_WL1273_CORE=m CONFIG_MFD_WM831X_I2C=y CONFIG_MFD_WM831X_SPI=y CONFIG_MFD_WM8350_I2C=y -CONFIG_MFD_WM8400=m CONFIG_MFD_WM8994=y CONFIG_MICREL_PHY=m CONFIG_MINIX_SUBPARTITION=y CONFIG_MMC_BLOCK=m CONFIG_MMC_SDHCI=m CONFIG_MMC_SDHCI_PLTFM=m -CONFIG_MMC_USHC=m -CONFIG_MMC_VUB300=m CONFIG_MODULE_SRCVERSION_ALL=y CONFIG_MODVERSIONS=y -CONFIG_MOUSE_APPLETOUCH=m -CONFIG_MOUSE_BCM5974=m -CONFIG_MOUSE_GPIO=m CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_PS2_SENTELIC=y -CONFIG_MOUSE_SERIAL=m -CONFIG_MOUSE_SYNAPTICS_I2C=m -CONFIG_MOUSE_VSXXXAA=m CONFIG_MTD=m CONFIG_MTD_BLKDEVS=m CONFIG_MTD_BLOCK=m @@ -189,7 +173,6 @@ CONFIG_MTD_NAND_IDS=m CONFIG_MTD_SM_COMMON=m CONFIG_MUSB_PIO_ONLY=y CONFIG_MUTEX_SPIN_ON_OWNER=y -CONFIG_MWIFIEX=m CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y CONFIG_NETCONSOLE=m @@ -343,7 +326,6 @@ CONFIG_TCG_TPM=y CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_MD5SIG=y CONFIG_TEST_KSTRTOX=m -CONFIG_TIMB_DMA=m CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m CONFIG_TOUCHSCREEN_EETI=m CONFIG_TOUCHSCREEN_EGALAX=m diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index ad453c92209..8c23e3c26cc 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -121,22 +121,16 @@ CONFIG_LOGIWHEELS_FF=y CONFIG_LOG_BUF_SHIFT=17 # CONFIG_LPARCFG is not set CONFIG_MAC80211_DEBUG_MENU=y -CONFIG_MAC80211_HWSIM=m CONFIG_MAC80211_MESH=y -CONFIG_MACVLAN=m CONFIG_MAC_PARTITION=y CONFIG_MAGIC_SYSRQ=y CONFIG_MAX_RAW_DEVS=256 -CONFIG_MEDIA_SUPPORT=m # CONFIG_MEMORY_HOTREMOVE is not set CONFIG_MFD_88PM860X=y CONFIG_MFD_AAT2870_CORE=y CONFIG_MFD_MAX8925=y CONFIG_MFD_MAX8997=y CONFIG_MFD_MAX8998=y -CONFIG_MFD_MC13XXX=m -CONFIG_MFD_PCF50633=m -CONFIG_MFD_SM501=m CONFIG_MFD_STMPE=y CONFIG_MFD_TC3589X=y # CONFIG_MFD_TMIO is not set @@ -144,29 +138,19 @@ CONFIG_MFD_TPS6586X=y CONFIG_MFD_TPS65910=y CONFIG_MFD_TPS65912_I2C=y CONFIG_MFD_TPS65912_SPI=y -CONFIG_MFD_WL1273_CORE=m CONFIG_MFD_WM831X_I2C=y CONFIG_MFD_WM831X_SPI=y CONFIG_MFD_WM8350_I2C=y -CONFIG_MFD_WM8400=m CONFIG_MFD_WM8994=y CONFIG_MICREL_PHY=m CONFIG_MINIX_SUBPARTITION=y CONFIG_MMC_BLOCK=m CONFIG_MMC_SDHCI=m CONFIG_MMC_SDHCI_PLTFM=m -CONFIG_MMC_USHC=m -CONFIG_MMC_VUB300=m CONFIG_MODULE_SRCVERSION_ALL=y CONFIG_MODVERSIONS=y -CONFIG_MOUSE_APPLETOUCH=m -CONFIG_MOUSE_BCM5974=m -CONFIG_MOUSE_GPIO=m CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_PS2_SENTELIC=y -CONFIG_MOUSE_SERIAL=m -CONFIG_MOUSE_SYNAPTICS_I2C=m -CONFIG_MOUSE_VSXXXAA=m CONFIG_MTD=m CONFIG_MTD_BLKDEVS=m CONFIG_MTD_BLOCK=m @@ -179,7 +163,6 @@ CONFIG_MTD_OF_PARTS=m CONFIG_MTD_SM_COMMON=m CONFIG_MUSB_PIO_ONLY=y CONFIG_MUTEX_SPIN_ON_OWNER=y -CONFIG_MWIFIEX=m CONFIG_NETCONSOLE=m CONFIG_NETPOLL=y CONFIG_NET_CALXEDA_XGMAC=m @@ -333,7 +316,6 @@ CONFIG_TCG_TPM=y CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_MD5SIG=y CONFIG_TEST_KSTRTOX=m -CONFIG_TIMB_DMA=m CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m CONFIG_TOUCHSCREEN_EETI=m CONFIG_TOUCHSCREEN_EGALAX=m diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index 4cfdbc10720..ad788082e88 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -134,23 +134,17 @@ CONFIG_LOGIWHEELS_FF=y CONFIG_LOG_BUF_SHIFT=19 CONFIG_LPARCFG=y CONFIG_MAC80211_DEBUG_MENU=y -CONFIG_MAC80211_HWSIM=m CONFIG_MAC80211_MESH=y -CONFIG_MACVLAN=m CONFIG_MAC_PARTITION=y CONFIG_MAGIC_SYSRQ=y CONFIG_MAX_ACTIVE_REGIONS=256 CONFIG_MAX_RAW_DEVS=8192 -CONFIG_MEDIA_SUPPORT=m CONFIG_MEMORY_HOTREMOVE=y CONFIG_MFD_88PM860X=y CONFIG_MFD_AAT2870_CORE=y CONFIG_MFD_MAX8925=y CONFIG_MFD_MAX8997=y CONFIG_MFD_MAX8998=y -CONFIG_MFD_MC13XXX=m -CONFIG_MFD_PCF50633=m -CONFIG_MFD_SM501=m CONFIG_MFD_STMPE=y CONFIG_MFD_TC3589X=y # CONFIG_MFD_TMIO is not set @@ -158,30 +152,20 @@ CONFIG_MFD_TPS6586X=y CONFIG_MFD_TPS65910=y CONFIG_MFD_TPS65912_I2C=y CONFIG_MFD_TPS65912_SPI=y -CONFIG_MFD_WL1273_CORE=m CONFIG_MFD_WM831X_I2C=y CONFIG_MFD_WM831X_SPI=y CONFIG_MFD_WM8350_I2C=y -CONFIG_MFD_WM8400=m CONFIG_MFD_WM8994=y CONFIG_MICREL_PHY=m CONFIG_MINIX_SUBPARTITION=y CONFIG_MMC_BLOCK=m CONFIG_MMC_SDHCI=m CONFIG_MMC_SDHCI_PLTFM=m -CONFIG_MMC_USHC=m -CONFIG_MMC_VUB300=m CONFIG_MMIO_NVRAM=y CONFIG_MODULE_SRCVERSION_ALL=y CONFIG_MODVERSIONS=y -CONFIG_MOUSE_APPLETOUCH=m -CONFIG_MOUSE_BCM5974=m -CONFIG_MOUSE_GPIO=m CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_PS2_SENTELIC=y -CONFIG_MOUSE_SERIAL=m -CONFIG_MOUSE_SYNAPTICS_I2C=m -CONFIG_MOUSE_VSXXXAA=m CONFIG_MPIC_U3_HT_IRQS=y CONFIG_MTD=m CONFIG_MTD_BLKDEVS=m @@ -195,7 +179,6 @@ CONFIG_MTD_OF_PARTS=m CONFIG_MTD_SM_COMMON=m CONFIG_MUSB_PIO_ONLY=y CONFIG_MUTEX_SPIN_ON_OWNER=y -CONFIG_MWIFIEX=m CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y CONFIG_NETCONSOLE=m @@ -367,7 +350,6 @@ CONFIG_TCG_TPM=y CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_MD5SIG=y CONFIG_TEST_KSTRTOX=m -CONFIG_TIMB_DMA=m CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m CONFIG_TOUCHSCREEN_EETI=m CONFIG_TOUCHSCREEN_EGALAX=m |