summaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-02-10 20:12:13 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2014-02-10 20:12:13 +0000
commitf73d6f102abb6130245b0328834e8f68ef6b0180 (patch)
tree5a22dc4868e6fc3cae2a066320fcc43dc45175f3 /package
parent40ad83f70ddc56f53cbcdc236818029f0a6e8e42 (diff)
downloadmaster-31e0f0ae-f73d6f102abb6130245b0328834e8f68ef6b0180.tar.gz
master-31e0f0ae-f73d6f102abb6130245b0328834e8f68ef6b0180.tar.bz2
master-31e0f0ae-f73d6f102abb6130245b0328834e8f68ef6b0180.zip
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> SVN-Revision: 39562
Diffstat (limited to 'package')
-rw-r--r--package/kernel/linux/modules/usb.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index d8b0d75cd0..a75d3e2fc9 100644
--- 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