diff options
-rw-r--r-- | debian.master/config/amd64/config.common.amd64 | 1 | ||||
-rw-r--r-- | debian.master/config/armel/config.common.armel | 1 | ||||
-rw-r--r-- | debian.master/config/config.common.ubuntu | 1 | ||||
-rw-r--r-- | debian.master/config/i386/config.common.i386 | 1 | ||||
-rw-r--r-- | debian.master/config/powerpc/config.common.powerpc | 1 | ||||
-rw-r--r-- | debian.master/config/ppc64/config.common.ppc64 | 1 |
6 files changed, 1 insertions, 5 deletions
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index fee8550e29d..541e9decf41 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -27,7 +27,6 @@ CONFIG_BLK_DEV_MD=y CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SR=y # CONFIG_BLK_DEV_SR_VENDOR is not set -CONFIG_BRCMSMAC=m CONFIG_BRCMUTIL=m CONFIG_BROADCOM_PHY=y CONFIG_CDROM_PKTCDVD=y diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index 8f4c2e4852f..d641f01fcde 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -20,7 +20,6 @@ CONFIG_BLK_DEV_MD=y CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SR=y # CONFIG_BLK_DEV_SR_VENDOR is not set -CONFIG_BRCMSMAC=m # CONFIG_BRCMUTIL is not set CONFIG_BROADCOM_PHY=y CONFIG_CDROM_PKTCDVD=m diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 67bd3f510b9..7eab4716e11 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -608,6 +608,7 @@ CONFIG_BPQETHER=m CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_BRCMDBG is not set CONFIG_BRCMFMAC=m +CONFIG_BRCMSMAC=m CONFIG_BRIDGE=m CONFIG_BRIDGE_EBT_802_3=m CONFIG_BRIDGE_EBT_AMONG=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index f68235a1577..cc9ef3090fd 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -24,7 +24,6 @@ CONFIG_BLK_DEV_MD=y CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SR=y # CONFIG_BLK_DEV_SR_VENDOR is not set -CONFIG_BRCMSMAC=m CONFIG_BRCMUTIL=m CONFIG_BROADCOM_PHY=y CONFIG_CDROM_PKTCDVD=y diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 218fecc617c..20ef504e444 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -22,7 +22,6 @@ CONFIG_BLK_DEV_MD=m CONFIG_BLK_DEV_SD=m CONFIG_BLK_DEV_SR=m # CONFIG_BLK_DEV_SR_VENDOR is not set -# CONFIG_BRCMSMAC is not set # CONFIG_BRCMUTIL is not set CONFIG_BROADCOM_PHY=m CONFIG_CDROM_PKTCDVD=m diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index fea8fa5f6da..8a511c61ddf 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -25,7 +25,6 @@ CONFIG_BLK_DEV_MD=m CONFIG_BLK_DEV_SD=m CONFIG_BLK_DEV_SR=m CONFIG_BLK_DEV_SR_VENDOR=y -CONFIG_BRCMSMAC=m # CONFIG_BRCMUTIL is not set CONFIG_BROADCOM_PHY=m CONFIG_CDROM_PKTCDVD=m |