Applied: [Quantal][PATCH] UBUNTU: [Config] disable CONFIG_B43_BCMA_EXTRA

[Leann Ogasawara]

On 05/18/2012 01:59 PM, Leann Ogasawara wrote:
> On 05/18/2012 11:14 AM, Seth Forshee wrote:
>> This option enables support in b43 for wireless devices also supported
>> by brcmsmac. brcmsmac is the preferred choice, so this option should be
>> disabled.
>>
>> Also add a check to the enforcer to ensure it doesn't get turned back
>> on by accident.
>>
>> Signed-off-by: Seth Forshee<seth.forshee at canonical.com>
>
> Looks reasonable to me.  It's even suggests in the Kconfig that this 
> should be disabled if brcmsmac is enabled.
>
> Signed-off-by: Leann Ogasawara <leann.ogasawara at canonical.com>
>
> Applied to Quantal master-next.
>
> Thanks,
> Leann
>
>> ---
>>   debian.master/config/config.common.ubuntu |    2 +-
>>   debian.master/config/enforce              |    5 +++++
>>   2 files changed, 6 insertions(+), 1 deletion(-)
>>
>> diff --git a/debian.master/config/config.common.ubuntu 
>> b/debian.master/config/config.common.ubuntu
>> index 95563e9..bf4d3dd 100644
>> --- a/debian.master/config/config.common.ubuntu
>> +++ b/debian.master/config/config.common.ubuntu
>> @@ -508,7 +508,7 @@ CONFIG_B43LEGACY_PCI_AUTOSELECT=y
>>   CONFIG_B43LEGACY_PIO=y
>>   # CONFIG_B43LEGACY_PIO_MODE is not set
>>   CONFIG_B43_BCMA=y
>> -CONFIG_B43_BCMA_EXTRA=y
>> +# CONFIG_B43_BCMA_EXTRA is not set
>>   CONFIG_B43_BCMA_PIO=y
>>   # CONFIG_B43_DEBUG is not set
>>   CONFIG_B43_HWRNG=y
>> diff --git a/debian.master/config/enforce b/debian.master/config/enforce
>> index 4da41d5..9399e23 100644
>> --- a/debian.master/config/enforce
>> +++ b/debian.master/config/enforce
>> @@ -109,3 +109,8 @@ value CONFIG_EFI_VARS y | !exists CONFIG_EFI_VARS
>>   (!exists CONFIG_DRM_PSB | value CONFIG_DRM_PSB n) | \
>>   ((value CONFIG_DRM_PSB y | value CONFIG_DRM_PSB m)&  (value 
>> CONFIG_STUB_POULSBO n | !exists CONFIG_STUB_POULSBO))
>>
>> +# Ensure CONFIG_B43_BCMA_EXTRA is disabled if CONFIG_BRCMSMAC is 
>> enabled.
>> +# Otherwise b43 and brcmsmac will overlap in the hardware they claim to
>> +# support.
>> +(!exists CONFIG_BRCMSMAC | value CONFIG_BRCMSMAC n) | \
>> +((value CONFIG_BRCMSMAC y | value CONFIG_BRCMSMAC m)&  (value 
>> CONFIG_B43_BCMA_EXTRA n | !exists CONFIG_B43_BCMA_EXTRA))
>