From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 29 May 2014 11:40:49 +0200
Subject: resolve merge conflict

---
 package/ether-wake/Makefile | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'package/ether-wake')

diff --git a/package/ether-wake/Makefile b/package/ether-wake/Makefile
index 9e82c316d..637009ab6 100644
--- a/package/ether-wake/Makefile
+++ b/package/ether-wake/Makefile
@@ -6,12 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		ether-wake
 PKG_VERSION:=		1.09
 PKG_RELEASE:=		1
-PKG_DESCR:=		Wake-On-LAN (WOL) client
-PKG_SECTION:=		net
+PKG_DESCR:=		wake-on-lan client
+PKG_SECTION:=		net/misc
 PKG_BB:=		1
 
 PKG_LIBC_DEPENDS:=	uclibc glibc
-
 NO_DISTFILES:=		1
 
 include ${TOPDIR}/mk/package.mk
@@ -22,8 +21,6 @@ CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
-TARGET_CFLAGS+=		-Wall
-
 do-build:
 	${TARGET_CC} ${TARGET_CPPFLAGS} ${TARGET_CFLAGS} ${TARGET_LDFLAGS} \
 		-o ${WRKBUILD}/ether-wake ${WRKBUILD}/ether-wake.c
-- 
cgit v1.2.3