aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/linux/modules
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2014-02-10 20:12:13 +0000
committerHauke Mehrtens <hauke@openwrt.org>2014-02-10 20:12:13 +0000
commitcbcc1ac2be838f8f4ec08665d6819e00c7e4554b (patch)
tree9ecbf7569bf40091583a8a92becfc8fc80072f74 /package/kernel/linux/modules
parent0e84472992345b8f32f564cad9eb8be38fd6269b (diff)
downloadupstream-cbcc1ac2be838f8f4ec08665d6819e00c7e4554b.tar.gz
upstream-cbcc1ac2be838f8f4ec08665d6819e00c7e4554b.tar.bz2
upstream-cbcc1ac2be838f8f4ec08665d6819e00c7e4554b.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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39562 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/linux/modules')
-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