diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-13 13:44:08 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-13 13:44:08 +0200 |
| commit | 05d715df3ac052fb41a5ab42369d05a3e2a82de3 (patch) | |
| tree | e99502f671b83f6898a77b78f88fdc67be8aa251 /package/iproute2 | |
| parent | e251f8299bf34e329613e68116d47e124192bc84 (diff) | |
resolve merge conflict
Diffstat (limited to 'package/iproute2')
| -rw-r--r-- | package/iproute2/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
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 |