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/ppp/Makefile | |
| parent | e251f8299bf34e329613e68116d47e124192bc84 (diff) | |
resolve merge conflict
Diffstat (limited to 'package/ppp/Makefile')
| -rw-r--r-- | package/ppp/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/package/ppp/Makefile b/package/ppp/Makefile index 44ac4bb98..0930e93c7 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -9,7 +9,6 @@ PKG_RELEASE:= 7 PKG_MD5SUM:= 4621bc56167b6953ec4071043fe0ec57 PKG_DESCR:= Point-to-Point Protocol software PKG_SECTION:= ppp -PKG_DEPENDS:= kmod-ppp PKG_BUILDDEP:= libpcap PKG_URL:= http://ppp.samba.org/ PKG_SITES:= ftp://ftp.samba.org/pub/ppp/ @@ -19,7 +18,6 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz PKG_SUBPKGS:= PPP PPP_MOD_PPPOA PPP_MOD_PPPOE PPP_MOD_RADIUS PKG_SUBPKGS+= PPP_MOD_CHAT PPP_MOD_PPPDUMP PPP_MOD_PPPSTATS PPP_MOD_PPPUMTS PKGSD_PPP_MOD_PPPOE:= PPP over Ethernet support -PKGSS_PPP_MOD_PPPOE:= kmod-pppoe PKGSN_PPP_MOD_PPPOE:= ppp PKGSD_PPP_MOD_PPPUMTS:= PPP UMTS support PKGSS_PPP_MOD_PPPUMTS:= comgt |