statically compile b44 into the kernel on brcm-2.6

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2824 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/Config.in b/target/linux/Config.in
index cd2c501..aa1b891 100644 (file)
--- a/target/linux/Config.in
+++ b/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
 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)
        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
 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)
        default m
        help
          Free driver for Broadcom Ethernet chipsets (without switch support)

diff --git a/target/linux/linux-2.6/config/brcm b/target/linux/linux-2.6/config/brcm
index e7ec865..16413fc 100644 (file)
--- a/target/linux/linux-2.6/config/brcm
+++ b/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_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
 # CONFIG_FORCEDETH is not set
 # CONFIG_DGRS is not set
 # CONFIG_EEPRO100 is not set