kernel: fix kmod-usb-net-smsc95xx

smsc95xx.ko depends on crc16.ko on kernel >= 3.8
There was an additional kmod-usb-net-smsc95xx definition in the mxs
target code which conflicted with the one in the common area.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39562 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index d8b0d75..a75d3e2 100644 (file)
--- a/package/kernel/linux/modules/usb.mk
+++ b/package/kernel/linux/modules/usb.mk
@@ -1037,7 +1037,7 @@ define KernelPackage/usb-net-smsc95xx
   KCONFIG:=CONFIG_USB_NET_SMSC95XX
   FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/smsc95xx.ko
   AUTOLOAD:=$(call AutoProbe,smsc95xx)
-  $(call AddDepends/usb-net)
+  $(call AddDepends/usb-net, +(!LINUX_3_3&&!LINUX_3_6):kmod-lib-crc16)
 endef
 
 define KernelPackage/usb-net-smsc95xx/description

diff --git a/target/linux/mxs/modules.mk b/target/linux/mxs/modules.mk
index 0cd900b..cbb870b 100644 (file)
--- a/target/linux/mxs/modules.mk
+++ b/target/linux/mxs/modules.mk
@@ -65,21 +65,6 @@ endef
 
 $(eval $(call KernelPackage,usb-mxs-phy,1))
 
-define KernelPackage/usb-net-smsc95xx
-    TITLE:=SMSC95xx USB/2.0 Ethernet driver
-    DEPENDS:=@TARGET_mxs
-    KCONFIG:=CONFIG_USB_NET_SMSC95XX
-    FILES:=$(LINUX_DIR)/drivers/net/usb/smsc95xx.ko
-    AUTOLOAD:=$(call AutoLoad,64,smsc95xx)
-    $(call AddDepends/usb-net)
-endef
-
-define KernelPackage/usb-net-smsc95xx/description
-    Kernel support for SMSC95xx USB/2.0 Ethernet driver
-endef
-
-$(eval $(call KernelPackage,usb-net-smsc95xx))
-
 define KernelPackage/sound-soc-mxs
     TITLE:=Freescale i.MX23/i.MX28 built-in SoC sound support
     KCONFIG:= \