[oe-commits] Koen Kooi : wpa-supplicant: fix merge error

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 312d954c468ea70676d22260582b12559d2d3ade
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=312d954c468ea70676d22260582b12559d2d3ade

Author: Koen Kooi <koen at openembedded.org>
Date:   Wed Oct  7 23:19:08 2009 +0200

wpa-supplicant: fix merge error

---

 recipes/wpa-supplicant/wpa-supplicant-0.6.inc |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/recipes/wpa-supplicant/wpa-supplicant-0.6.inc b/recipes/wpa-supplicant/wpa-supplicant-0.6.inc
index e3ab397..05d439f 100644
--- a/recipes/wpa-supplicant/wpa-supplicant-0.6.inc
+++ b/recipes/wpa-supplicant/wpa-supplicant-0.6.inc
@@ -12,7 +12,6 @@ DEFAULT_PREFERENCE = "-2"
 
 SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
 	file://defconfig-0.6.0-gnutls \
-	file://action_wpa.sh \
 	file://ifupdown.sh \
 	file://functions.sh"
 
@@ -58,7 +57,6 @@ do_install () {
 	install -d ${D}${sysconfdir}/network/if-down.d/
 
 	install -d ${D}${sysconfdir}/wpa_supplicant
-	install -m 755 ${WORKDIR}/action_wpa.sh ${D}${sysconfdir}/wpa_supplicant/
 	install -m 755 ${WORKDIR}/ifupdown.sh ${D}${sysconfdir}/wpa_supplicant/
 	install -m 755 ${WORKDIR}/functions.sh ${D}${sysconfdir}/wpa_supplicant