summaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorwbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-12-25 18:28:26 +0000
committerwbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-12-25 18:28:26 +0000
commit5ae9fadf3548472e929f802848232c28245dd6c5 (patch)
tree17015a7392bb1b8ecfb2f0dcf3874974314d1792 /target/linux
parentd652f305ac241e90971276bfe460d4939ea32100 (diff)
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
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/Config.in8
-rw-r--r--target/linux/package/switch/Config.in1
-rw-r--r--target/linux/package/switch/Makefile2
3 files changed, 6 insertions, 5 deletions
diff --git a/target/linux/Config.in b/target/linux/Config.in
index 8be01a1e6..9442c9fc9 100644
--- 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 dcf73a32c..5f7d7dc86 100644
--- 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 0db826d64..75b35954e 100644
--- 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)" \