From 05d715df3ac052fb41a5ab42369d05a3e2a82de3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 13 May 2014 13:44:08 +0200 Subject: resolve merge conflict --- package/iproute2/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'package/iproute2/Makefile') diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile index 8543dd91e..c74245a6f 100644 --- a/package/iproute2/Makefile +++ b/package/iproute2/Makefile @@ -16,7 +16,6 @@ PKG_SITES:= http://www.kernel.org/pub/linux/utils/net/iproute2/ PKG_SUBPKGS:= IP TC TC_ATM TC_IPT IFSTAT LNSTAT ROUTEL RTMON SS PKGSD_TC:= iproute2 traffic control utility -PKGSS_TC:= kmod-sched PKGSB_TC:= iptables PKGSD_TC_ATM:= iproute2 traffic control ATM support library PKGSS_TC_ATM:= tc libatm -- cgit v1.2.3