diff options
| author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2014-02-10 20:12:13 +0000 |
|---|---|---|
| committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2014-02-10 20:12:13 +0000 |
| commit | 9f101205dfc405b949a6b33f776ad10dc208bfe8 (patch) | |
| tree | 9ecbf7569bf40091583a8a92becfc8fc80072f74 | |
| parent | 6e62039e6b77f302a91be83beacc48d57948e71a (diff) | |
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
| -rw-r--r-- | package/kernel/linux/modules/usb.mk | 2 | ||||
| -rw-r--r-- | target/linux/mxs/modules.mk | 15 |
2 files changed, 1 insertions, 16 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 diff --git a/target/linux/mxs/modules.mk b/target/linux/mxs/modules.mk index 0cd900ba77..cbb870b49d 100644 --- 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:= \ |