Build usbnet modules for brcm targets (#1481)

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

diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index cffd053..eb97262 100644 (file)
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -277,10 +277,17 @@ define KernelPackage/usb-net
   DESCRIPTION:=Kernel modules for USB-to-Ethernet convertors
   KCONFIG:=$(CONFIG_USB_USBNET)
   DEPENDS:=@USB_SUPPORT
-  FILES:= \
-        $(MODULES_DIR)/kernel/drivers/usb/net/usbnet.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call Autoload,60, usbnet)
 endef
+
+define KernelPackage/usb-net/2.4
+  FILES:=$(MODULES_DIR)/kernel/drivers/usb/usbnet.$(LINUX_KMOD_SUFFIX)
+endef
+
+define KernelPackage/usb-net/2.6
+  FILES:=$(MODULES_DIR)/kernel/drivers/usb/net/usbnet.$(LINUX_KMOD_SUFFIX)
+endef
+
 $(eval $(call KernelPackage,usb-net))
 
 define KernelPackage/usb-net-asix
@@ -289,8 +296,16 @@ define KernelPackage/usb-net-asix
   DESCRIPTION:=Kernel module for USB-to-Ethernet Asix convertors
   DEPENDS:=kmod-usb-net
   KCONFIG:=$(CONFIG_USB_NET_AX8817X)
-  FILES:= \
-        $(MODULES_DIR)/kernel/drivers/usb/net/asix.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call Autoload,61, asix)
 endef
+
+define KernelPackage/usb-net-asix/2.4
+  FILES:=$(MODULES_DIR)/kernel/drivers/usb/ax8817x.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call Autoload,61,ax8817x)
+endef
+
+define KernelPackage/usb-net-asix/2.6
+  FILES:=$(MODULES_DIR)/kernel/drivers/usb/net/asix.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call Autoload,61,asix)
+endef
+
 $(eval $(call KernelPackage,usb-net-asix))

diff --git a/target/linux/brcm-2.4/config/default b/target/linux/brcm-2.4/config/default
index 876aba9..60355f8 100644 (file)
--- a/target/linux/brcm-2.4/config/default
+++ b/target/linux/brcm-2.4/config/default
@@ -346,7 +346,6 @@ CONFIG_USB_STORAGE_SDDR55=y
 # CONFIG_USB_TIGL is not set
 CONFIG_USB_UHCI=m
 CONFIG_USB_UHCI_ALT=m
-# CONFIG_USB_USBNET is not set
 # CONFIG_USB_USS720 is not set
 # CONFIG_USB_VICAM is not set
 # CONFIG_USB_W9968CF is not set

diff --git a/target/linux/brcm47xx-2.6/config/default b/target/linux/brcm47xx-2.6/config/default
index 40788b2..d5c74d1 100644 (file)
--- a/target/linux/brcm47xx-2.6/config/default
+++ b/target/linux/brcm47xx-2.6/config/default
@@ -319,8 +319,6 @@ CONFIG_USB_OHCI_HCD=m
 # CONFIG_USB_STORAGE_SDDR55 is not set
 # CONFIG_USB_STORAGE_USBAT is not set
 CONFIG_USB_UHCI_HCD=m
-# CONFIG_USB_USBNET is not set
-# CONFIG_USB_USBNET_MII is not set
 # CONFIG_VIA_RHINE is not set
 # CONFIG_VIDEO_CX2341X is not set
 CONFIG_VIDEO_DEV=m