From 91d42f6ac22bca42fb81846e82d6c4a66957809d Mon Sep 17 00:00:00 2001 From: wbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73> Date: Sun, 25 Dec 2005 18:28:26 +0000 Subject: [PATCH] use b44/switch driver on 2.4-brcm and 2.6-brcm git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2780 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- openwrt/target/linux/Config.in | 8 ++++---- openwrt/target/linux/package/switch/Config.in | 1 + openwrt/target/linux/package/switch/Makefile | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/openwrt/target/linux/Config.in b/openwrt/target/linux/Config.in index 8be01a1e6..9442c9fc9 100644 --- a/openwrt/target/linux/Config.in +++ b/openwrt/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/openwrt/target/linux/package/switch/Config.in b/openwrt/target/linux/package/switch/Config.in index dcf73a32c..5f7d7dc86 100644 --- a/openwrt/target/linux/package/switch/Config.in +++ b/openwrt/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/openwrt/target/linux/package/switch/Makefile b/openwrt/target/linux/package/switch/Makefile index 0db826d64..75b35954e 100644 --- a/openwrt/target/linux/package/switch/Makefile +++ b/openwrt/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)" \ -- 2.20.1