From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 May 2014 11:40:49 +0200 Subject: resolve merge conflict --- package/wpa_supplicant/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/wpa_supplicant/Makefile') diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile index 11f4ee693..52cc753e3 100644 --- a/package/wpa_supplicant/Makefile +++ b/package/wpa_supplicant/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= wpa_supplicant PKG_VERSION:= 2.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 3be2ebfdcced52e00eda0afe2889839d -PKG_DESCR:= WPA Supplicant with support for WPA and WPA2 -PKG_SECTION:= wifi +PKG_DESCR:= wpa supplicant +PKG_SECTION:= net/wifi PKG_DEPENDS:= libnl PKG_BUILDDEP:= libnl PKG_URL:= http://hostap.epitest.fi/wpa_supplicant/ -- cgit v1.2.3