statically compile b44 into the kernel on brcm-2.6

SVN-Revision: 2824

diff --git a/openwrt/target/linux/Config.in b/openwrt/target/linux/Config.in
index cd2c5017ac3e1132fde9385c0a00f94284f65dc9..aa1b8913ec7c46450ba95254597f593cfdc82b96 100644 (file)
--- 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 e7ec865e58cb4a7cbb616fdd0ecd52eb101fba08..16413fc41919edbe64681c61fb52e8883b517038 100644 (file)
--- 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