UBUNTU: [Config] highbank -- commonise A-C modules missmatches

    CONFIG_ASUS_OLED=m
    CONFIG_ASYNC_RAID6_TEST=m
    CONFIG_AT76C50X_USB=m
    CONFIG_ATH_COMMON=m
    CONFIG_B43=m
    CONFIG_B43LEGACY=m
    CONFIG_B44=m
    CONFIG_BATMAN_ADV=m
    CONFIG_BCMA=m
    CONFIG_BCM_WIMAX=m
    CONFIG_BRCMFMAC=m
    CONFIG_CDROM_PKTCDVD=m

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

8 files changed, 13 insertions, 91 deletions

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 91a6e144a0b..fbb0662fb80 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -14,41 +14,28 @@ CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_SPARSEMEM_DEFAULT=y
 CONFIG_ARCH_SUPPORTS_MSI=y
-CONFIG_ASUS_OLED=m
-CONFIG_ASYNC_RAID6_TEST=m
 # CONFIG_ASYNC_TX_DMA is not set
-CONFIG_AT76C50X_USB=m
 CONFIG_ATARI_PARTITION=y
 CONFIG_ATA_GENERIC=y
 # CONFIG_ATA_NONSTANDARD is not set
 CONFIG_ATA_PIIX=y
-CONFIG_ATH_COMMON=m
 # CONFIG_ATM_BR2684_IPFILTER is not set
 CONFIG_AUDIT_ARCH=y
 CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
-CONFIG_B43=m
-CONFIG_B43LEGACY=m
-CONFIG_B44=m
-CONFIG_BATMAN_ADV=m
 CONFIG_BCH=m
-CONFIG_BCMA=m
-CONFIG_BCM_WIMAX=m
 CONFIG_BINARY_PRINTF=y
 # CONFIG_BLK_DEV_SR_VENDOR is not set
-CONFIG_BRCMFMAC=m
 CONFIG_BSD_DISKLABEL=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BTRFS_FS_POSIX_ACL=y
 CONFIG_CAN=m
-CONFIG_CDROM_PKTCDVD=m
 CONFIG_CFG80211_REG_DEBUG=y
 CONFIG_CGROUPS=y
 CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
 CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_CLEANCACHE=y
 CONFIG_COMPACTION=y
-CONFIG_CORDIC=m
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_IDLE=y
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 0ddf439c66b..f9b39868f94 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -15,40 +15,27 @@ CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 CONFIG_ARM_ERRATA_430973=y
 CONFIG_ARM_ERRATA_743622=y
 CONFIG_ARM_LPAE=y
-CONFIG_ASUS_OLED=m
-CONFIG_ASYNC_RAID6_TEST=m
 CONFIG_ASYNC_TX_DMA=y
-CONFIG_AT76C50X_USB=m
 CONFIG_ATARI_PARTITION=y
 # CONFIG_ATA_NONSTANDARD is not set
-CONFIG_ATH_COMMON=m
 CONFIG_ATMEL_PWM=m
 CONFIG_ATM_BR2684_IPFILTER=y
 CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
-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
 # CONFIG_BLK_DEV_SR_VENDOR is not set
-CONFIG_BRCMFMAC=m
 CONFIG_BSD_DISKLABEL=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_CACHE_L2X0 is not set
 CONFIG_CAN=m
-CONFIG_CDROM_PKTCDVD=m
 CONFIG_CFG80211_REG_DEBUG=y
 CONFIG_CGROUPS=y
 # CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
 CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_CLEANCACHE=y
 # CONFIG_COMPACTION is not set
-CONFIG_CORDIC=m
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_IDLE=y
diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank
index d28cd805cb6..59f679cf375 100644
--- a/debian.master/config/armhf/config.flavour.highbank
+++ b/debian.master/config/armhf/config.flavour.highbank
@@ -11,34 +11,21 @@ CONFIG_ARCH_HIGHBANK=y
 # CONFIG_ARM_ERRATA_430973 is not set
 # CONFIG_ARM_ERRATA_743622 is not set
 # CONFIG_ARM_LPAE is not set
-# CONFIG_ASUS_OLED is not set
-# CONFIG_ASYNC_RAID6_TEST is not set
 # CONFIG_ASYNC_TX_DMA is not set
-# CONFIG_AT76C50X_USB is not set
 # CONFIG_ATARI_PARTITION is not set
-# CONFIG_ATH_COMMON is not set
 # CONFIG_ATMEL_PWM is not set
 # CONFIG_AUXDISPLAY is not set
-# CONFIG_B43 is not set
-# 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
-# CONFIG_BRCMFMAC is not set
 # CONFIG_BSD_DISKLABEL is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_BTRFS_FS_POSIX_ACL is not set
 CONFIG_CACHE_L2X0=y
 # CONFIG_CAN is not set
-# CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_CFG80211_REG_DEBUG is not set
 # CONFIG_CGROUPS is not set
 # CONFIG_CHECKPOINT_RESTORE is not set
 # CONFIG_CLEANCACHE 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
diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap
index ac7d0f42fa2..221db72553b 100644
--- a/debian.master/config/armhf/config.flavour.omap
+++ b/debian.master/config/armhf/config.flavour.omap
@@ -11,34 +11,21 @@ CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 CONFIG_ARM_ERRATA_430973=y
 CONFIG_ARM_ERRATA_743622=y
 CONFIG_ARM_LPAE=y
-CONFIG_ASUS_OLED=m
-CONFIG_ASYNC_RAID6_TEST=m
 CONFIG_ASYNC_TX_DMA=y
-CONFIG_AT76C50X_USB=m
 CONFIG_ATARI_PARTITION=y
-CONFIG_ATH_COMMON=m
 CONFIG_ATMEL_PWM=m
 CONFIG_AUXDISPLAY=y
-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
-CONFIG_BRCMFMAC=m
 CONFIG_BSD_DISKLABEL=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_CACHE_L2X0 is not set
 CONFIG_CAN=m
-CONFIG_CDROM_PKTCDVD=m
 CONFIG_CFG80211_REG_DEBUG=y
 CONFIG_CGROUPS=y
 CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_CLEANCACHE=y
-CONFIG_CORDIC=m
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_CPU_IDLE=y
 CONFIG_CRASH_DUMP=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index bfc0bb7c98c..d2dac101eac 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -376,15 +376,18 @@ CONFIG_ARM_UNWIND=y
 CONFIG_ASHMEM=y
 CONFIG_ASUS_LAPTOP=m
 CONFIG_ASUS_NB_WMI=m
+CONFIG_ASUS_OLED=m
 CONFIG_ASUS_WMI=m
 CONFIG_ASYNC_CORE=m
 CONFIG_ASYNC_MEMCPY=m
 CONFIG_ASYNC_PQ=m
 CONFIG_ASYNC_RAID6_RECOV=m
+CONFIG_ASYNC_RAID6_TEST=m
 CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
 CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
 CONFIG_ASYNC_XOR=m
 CONFIG_AT1700=m
+CONFIG_AT76C50X_USB=m
 CONFIG_ATA=y
 CONFIG_ATAGS_PROC=y
 CONFIG_ATALK=m
@@ -413,6 +416,7 @@ CONFIG_ATH9K_HW=m
 # CONFIG_ATH9K_MAC_DEBUG is not set
 CONFIG_ATH9K_PCI=y
 CONFIG_ATH9K_RATE_CONTROL=y
+CONFIG_ATH_COMMON=m
 # CONFIG_ATH_DEBUG is not set
 CONFIG_ATL1=m
 CONFIG_ATL1C=m
@@ -486,6 +490,8 @@ CONFIG_AUTOFS4_FS=m
 CONFIG_AVERAGE=y
 CONFIG_AX25=m
 # CONFIG_AX88796 is not set
+CONFIG_B43=m
+CONFIG_B43LEGACY=m
 CONFIG_B43LEGACY_DEBUG=y
 CONFIG_B43LEGACY_DMA=y
 CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
@@ -511,6 +517,7 @@ CONFIG_B43_PHY_N=y
 CONFIG_B43_PIO=y
 # CONFIG_B43_SDIO is not set
 CONFIG_B43_SSB=y
+CONFIG_B44=m
 CONFIG_B44_PCI=y
 CONFIG_B44_PCICORE_AUTOSELECT=y
 CONFIG_B44_PCI_AUTOSELECT=y
@@ -538,6 +545,7 @@ CONFIG_BACKLIGHT_WM831X=m
 # CONFIG_BACKTRACE_SELF_TEST is not set
 CONFIG_BASE_FULL=y
 CONFIG_BASE_SMALL=0
+CONFIG_BATMAN_ADV=m
 # CONFIG_BATMAN_ADV_DEBUG is not set
 CONFIG_BATTERY_BQ27X00_I2C=y
 CONFIG_BATTERY_BQ27X00_PLATFORM=y
@@ -559,11 +567,13 @@ CONFIG_BAYCOM_SER_HDX=m
 CONFIG_BCH_CONST_M=14
 CONFIG_BCH_CONST_PARAMS=y
 CONFIG_BCH_CONST_T=4
+CONFIG_BCMA=m
 CONFIG_BCMA_BLOCKIO=y
 # CONFIG_BCMA_DEBUG is not set
 CONFIG_BCMA_HOST_PCI=y
 CONFIG_BCMA_HOST_PCI_POSSIBLE=y
 CONFIG_BCMA_POSSIBLE=y
+CONFIG_BCM_WIMAX=m
 # CONFIG_BDI_SWITCH is not set
 CONFIG_BE2ISCSI=m
 CONFIG_BE2NET=m
@@ -671,6 +681,7 @@ CONFIG_BPQETHER=m
 CONFIG_BQL=y
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_BRCMDBG is not set
+CONFIG_BRCMFMAC=m
 CONFIG_BRCMFMAC_SDIO=y
 CONFIG_BRCMFMAC_USB=y
 CONFIG_BRCMSMAC=m
@@ -804,6 +815,7 @@ CONFIG_CB710_DEBUG_ASSUMPTIONS=y
 CONFIG_CBE_CPUFREQ_SPU_GOVERNOR=m
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_CC_STACKPROTECTOR=y
+CONFIG_CDROM_PKTCDVD=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
 CONFIG_CEPH_FS=m
@@ -1021,6 +1033,7 @@ CONFIG_CONTEXT_SWITCH_TRACER=y
 CONFIG_COPS=m
 CONFIG_COPS_DAYNA=y
 CONFIG_COPS_TANGENT=y
+CONFIG_CORDIC=m
 CONFIG_COSA=m
 # CONFIG_CPA_DEBUG is not set
 CONFIG_CPU5_WDT=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 58dd17c33ce..e8b832f008d 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -13,41 +13,28 @@ CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_SUPPORTS_MSI=y
-CONFIG_ASUS_OLED=m
-CONFIG_ASYNC_RAID6_TEST=m
 CONFIG_ASYNC_TX_DMA=y
-CONFIG_AT76C50X_USB=m
 CONFIG_ATARI_PARTITION=y
 CONFIG_ATA_GENERIC=y
 # CONFIG_ATA_NONSTANDARD is not set
 CONFIG_ATA_PIIX=y
-CONFIG_ATH_COMMON=m
 # CONFIG_ATM_BR2684_IPFILTER is not set
 # CONFIG_AUDIT_ARCH is not set
 CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
-CONFIG_B43=m
-CONFIG_B43LEGACY=m
-CONFIG_B44=m
-CONFIG_BATMAN_ADV=m
 CONFIG_BCH=m
-CONFIG_BCMA=m
-CONFIG_BCM_WIMAX=m
 CONFIG_BINARY_PRINTF=y
 # CONFIG_BLK_DEV_SR_VENDOR is not set
-CONFIG_BRCMFMAC=m
 CONFIG_BSD_DISKLABEL=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BTRFS_FS_POSIX_ACL=y
 CONFIG_CAN=m
-CONFIG_CDROM_PKTCDVD=m
 CONFIG_CFG80211_REG_DEBUG=y
 CONFIG_CGROUPS=y
 CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
 CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_CLEANCACHE=y
 CONFIG_COMPACTION=y
-CONFIG_CORDIC=m
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_IDLE=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index b66113302e5..9cb590bdf5e 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -10,39 +10,26 @@ CONFIG_APM_EMULATION=m
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_SPARSEMEM_DEFAULT=y
 CONFIG_ARCH_SUPPORTS_MSI=y
-CONFIG_ASUS_OLED=m
-CONFIG_ASYNC_RAID6_TEST=m
 # CONFIG_ASYNC_TX_DMA is not set
-CONFIG_AT76C50X_USB=m
 CONFIG_ATARI_PARTITION=y
 CONFIG_ATA_GENERIC=m
 CONFIG_ATA_PIIX=m
-CONFIG_ATH_COMMON=m
 # CONFIG_ATM_BR2684_IPFILTER is not set
 CONFIG_AUDIT_ARCH=y
 CONFIG_AUXDISPLAY=y
 # CONFIG_AX25_DAMA_SLAVE is not set
-CONFIG_B43=m
-CONFIG_B43LEGACY=m
-CONFIG_B44=m
-CONFIG_BATMAN_ADV=m
 CONFIG_BCH=m
-CONFIG_BCMA=m
-CONFIG_BCM_WIMAX=m
 CONFIG_BINARY_PRINTF=y
 # CONFIG_BLK_DEV_SR_VENDOR is not set
-CONFIG_BRCMFMAC=m
 CONFIG_BSD_DISKLABEL=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BTRFS_FS_POSIX_ACL=y
 CONFIG_CAN=m
-CONFIG_CDROM_PKTCDVD=m
 CONFIG_CGROUPS=y
 CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
 CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_CLEANCACHE=y
 # CONFIG_COMPACTION is not set
-CONFIG_CORDIC=m
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_CPU_FREQ_STAT=m
 CONFIG_CPU_IDLE=y
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 1ebe2839d57..1c49b5a5137 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -12,41 +12,28 @@ CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_SPARSEMEM_DEFAULT=y
 CONFIG_ARCH_SUPPORTS_MSI=y
-CONFIG_ASUS_OLED=m
-CONFIG_ASYNC_RAID6_TEST=m
 # CONFIG_ASYNC_TX_DMA is not set
-CONFIG_AT76C50X_USB=m
 CONFIG_ATARI_PARTITION=y
 CONFIG_ATA_GENERIC=m
 CONFIG_ATA_NONSTANDARD=y
 CONFIG_ATA_PIIX=m
-CONFIG_ATH_COMMON=m
 # CONFIG_ATM_BR2684_IPFILTER is not set
 CONFIG_AUDIT_ARCH=y
 CONFIG_AUXDISPLAY=y
 # CONFIG_AX25_DAMA_SLAVE is not set
-CONFIG_B43=m
-CONFIG_B43LEGACY=m
-CONFIG_B44=m
-CONFIG_BATMAN_ADV=m
 CONFIG_BCH=m
-CONFIG_BCMA=m
-CONFIG_BCM_WIMAX=m
 CONFIG_BINARY_PRINTF=y
 CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_BRCMFMAC=m
 CONFIG_BSD_DISKLABEL=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BTRFS_FS_POSIX_ACL=y
 CONFIG_CAN=m
-CONFIG_CDROM_PKTCDVD=m
 # CONFIG_CFG80211_REG_DEBUG is not set
 CONFIG_CGROUPS=y
 CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
 CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_CLEANCACHE=y
 CONFIG_COMPACTION=y
-CONFIG_CORDIC=m
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_CPU_FREQ_STAT=m
 CONFIG_CPU_IDLE=y