aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2015-01-04 18:41:32 +0000
committerImre Kaloz <kaloz@openwrt.org>2015-01-04 18:41:32 +0000
commitb1446f3173e48b116f7deb56fb4f12ed07fa1850 (patch)
tree43727a295cdcde476cd7684f6eed873719287c30
parent4e7a1c8873135c1b0276150f4094266a1130bc4d (diff)
downloadupstream-b1446f3173e48b116f7deb56fb4f12ed07fa1850.tar.gz
upstream-b1446f3173e48b116f7deb56fb4f12ed07fa1850.tar.bz2
upstream-b1446f3173e48b116f7deb56fb4f12ed07fa1850.zip
[netdevices.mk]: et131x is out of staging in 3.18
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43827 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/kernel/linux/modules/netdevices.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk
index 1eaf922f78..84cb68c040 100644
--- a/package/kernel/linux/modules/netdevices.mk
+++ b/package/kernel/linux/modules/netdevices.mk
@@ -114,7 +114,11 @@ define KernelPackage/et131x
SUBMENU:=$(NETWORK_DEVICES_MENU)
TITLE:=Agere ET131x Gigabit Ethernet driver
URL:=http://sourceforge.net/projects/et131x
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.18.0)),1)
+ FILES:=$(LINUX_DIR)/drivers/net/ethernet/agere/et131x.$(LINUX_KMOD_SUFFIX)
+else
FILES:=$(LINUX_DIR)/drivers/staging/et131x/et131x.$(LINUX_KMOD_SUFFIX)
+endif
KCONFIG:= \
CONFIG_ET131X \
CONFIG_ET131X_DEBUG=n