From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 17 Jan 2011 02:15:27 +0000 (+0000)
Subject: [backfire] merge r25027 and r25028
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=286c479bf1df839683c2ba86532ec4e49d866f24

[backfire] merge r25027 and r25028

SVN-Revision: 25029
---

diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index 6b4fe840dd..4366026ee7 100644
--- 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 c64e809de3..dbb6eb00e4 100644
--- 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"
 }