summaryrefslogtreecommitdiffstats
path: root/openwrt
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-01-04 20:34:34 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-01-04 20:34:34 +0000
commit4430c60e7c1728c3b56ea571c70b1eeca1406376 (patch)
treea39b8ff78fdc7d3518fdd5f621442524be9a2e24 /openwrt
parentda977bbb284999fe2619ff8c8e3b57d1459ca154 (diff)
statically compile b44 into the kernel on brcm-2.6
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2824 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'openwrt')
-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 cd2c5017a..aa1b8913e 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 e7ec865e5..16413fc41 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