use b44/switch driver on 2.4-brcm and 2.6-brcm

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

diff --git a/target/linux/Config.in b/target/linux/Config.in
index 8be01a1..9442c9f 100644 (file)
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -62,10 +62,10 @@ comment "Device specific modules"
 config BR2_PACKAGE_KMOD_BRCM_ET
        prompt "kmod-brcm-et...................... Broadcom Ethernet Driver"
        tristate
-       depends BR2_LINUX_2_4_BRCM
-       default y
+       depends BR2_LINUX_2_4_BRCM || BR2_LINUX_2_6_BRCM
+       default m
        help
-         Proprietary driver for Broadcom Ethernet chipsets
+         Proprietary driver for Broadcom Ethernet chipsets (obsolete)
 
 config BR2_PACKAGE_KMOD_BRCM_WL
        prompt "kmod-brcm-wl...................... Broadcom Wireless Network Driver"
@@ -546,7 +546,7 @@ 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
+       default y if BR2_LINUX_2_6_BRCM || BR2_LINUX_2_4_BRCM
        default m
        help
          Free driver for Broadcom Ethernet chipsets (without switch support)

diff --git a/target/linux/package/switch/Config.in b/target/linux/package/switch/Config.in
index dcf73a3..5f7d7dc 100644 (file)
--- a/target/linux/package/switch/Config.in
+++ b/target/linux/package/switch/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_KMOD_SWITCH
        prompt "kmod-switch....................... Kernel driver for ROBO and ADMTEK SWITCH"
        tristate
+       default y if BR2_LINUX_2_6_BRCM || BR2_LINUX_2_4_BRCM
        default m if CONFIG_DEVEL
        help
          Kernel driver for ROBO and ADMTEK switches.

diff --git a/target/linux/package/switch/Makefile b/target/linux/package/switch/Makefile
index 0db826d..75b3595 100644 (file)
--- a/target/linux/package/switch/Makefile
+++ b/target/linux/package/switch/Makefile
@@ -25,7 +25,7 @@ $(PKG_BUILD_DIR)/.configured:
        touch $@
 
 $(PKG_BUILD_DIR)/.built:
-       $(MAKE) -C "$(LINUX_DIR)" \
+       $(MAKE) -C "$(KERNEL_DIR)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \
                ARCH="$(LINUX_KARCH)" \
                PATH="$(TARGET_PATH)" \