[backfire] merge r25027 and r25028

SVN-Revision: 25029

diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index 6b4fe840dd647877ad2da280603093699c017b0c..4366026ee71f6eccbe8a0a86693da79943ab086d 100644 (file)
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ppp
 PKG_VERSION:=2.4.4
-PKG_RELEASE:=14
+PKG_RELEASE:=15
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/

diff --git a/package/ppp/files/pppoa.sh b/package/ppp/files/pppoa.sh
index c64e809de389b6dad17b9f0dbad98b99dbfb5d51..dbb6eb00e42ee813b8a47c1631ae5693147eb9f7 100644 (file)
--- a/package/ppp/files/pppoa.sh
+++ b/package/ppp/files/pppoa.sh
@@ -2,10 +2,6 @@ scan_pppoa() {
        config_set "$1" device "pppoa-$1"
 }
 
-coldplug_interface_pppoa() {
-       setup_interface_pppoa x "$1"
-}
-
 stop_interface_pppoa() {
        stop_interface_ppp "$1"
 }