From 0719817ec453ebab4d71fec06e6d5942dbced72b Mon Sep 17 00:00:00 2001 From: Andy Whitcroft Date: Fri, 1 Jun 2012 18:11:06 +0100 Subject: 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 --- debian.master/config/config.common.ubuntu | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'debian.master/config/config.common.ubuntu') 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 -- cgit v1.2.3