summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2006-01-04 20:34:34 +0000
committerFelix Fietkau <nbd@openwrt.org>2006-01-04 20:34:34 +0000
commit17444a75f70b8bf62deb28a9608b09f95c3c615c (patch)
treeeb7a74e3c0b89956e87aeef4ec90eefac2e56571
parentd951f94e5422c226efcd29d326233b6a9907c05a (diff)
downloadmtk-20170518-17444a75f70b8bf62deb28a9608b09f95c3c615c.zip
mtk-20170518-17444a75f70b8bf62deb28a9608b09f95c3c615c.tar.gz
mtk-20170518-17444a75f70b8bf62deb28a9608b09f95c3c615c.tar.bz2
statically compile b44 into the kernel on brcm-2.6
SVN-Revision: 2824
-rw-r--r--openwrt/target/linux/Config.in5
-rw-r--r--openwrt/target/linux/linux-2.6/config/brcm2
2 files changed, 4 insertions, 3 deletions
diff --git a/openwrt/target/linux/Config.in b/openwrt/target/linux/Config.in
index cd2c501..aa1b891 100644
--- a/openwrt/target/linux/Config.in
+++ b/openwrt/target/linux/Config.in
@@ -70,7 +70,7 @@ comment "Device specific modules"
config BR2_PACKAGE_KMOD_BRCM_ET
prompt "kmod-brcm-et...................... Broadcom Ethernet Driver"
tristate
- depends BR2_LINUX_2_4_BRCM || BR2_LINUX_2_6_BRCM
+ depends BR2_LINUX_2_4_BRCM
default m
help
Proprietary driver for Broadcom Ethernet chipsets (obsolete)
@@ -561,7 +561,8 @@ config BR2_PACKAGE_KMOD_NET_E100
config BR2_PACKAGE_KMOD_NET_B44
prompt "kmod-net-b44...................... Broadcom 44XX, 47XX ethernet driver"
tristate
- default y if BR2_LINUX_2_6_BRCM || BR2_LINUX_2_4_BRCM
+ depends !BR2_LINUX_2_6_BRCM
+ default y if BR2_LINUX_2_4_BRCM
default m
help
Free driver for Broadcom Ethernet chipsets (without switch support)
diff --git a/openwrt/target/linux/linux-2.6/config/brcm b/openwrt/target/linux/linux-2.6/config/brcm
index e7ec865..16413fc 100644
--- a/openwrt/target/linux/linux-2.6/config/brcm
+++ b/openwrt/target/linux/linux-2.6/config/brcm
@@ -841,7 +841,7 @@ CONFIG_NET_PCI=y
# CONFIG_PCNET32 is not set
# CONFIG_AMD8111_ETH is not set
# CONFIG_ADAPTEC_STARFIRE is not set
-CONFIG_B44=m
+CONFIG_B44=y
# CONFIG_FORCEDETH is not set
# CONFIG_DGRS is not set
# CONFIG_EEPRO100 is not set