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/alix-switch/Makefile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'package/alix-switch')

diff --git a/package/alix-switch/Makefile b/package/alix-switch/Makefile
index 8beb7837e..6bbfabcb3 100644
--- a/package/alix-switch/Makefile
+++ b/package/alix-switch/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:=		alix-switch
 PKG_VERSION:=		1.0
 PKG_RELEASE:=		4
 PKG_DESCR:=		daemon listening on button events
-PKG_SECTION:=		base
+PKG_SECTION:=		base/misc
 PKG_URL:=		http://openadk.org/
 
 PKG_SYSTEM_DEPENDS:=	pcengines-alix2d2 pcengines-alix2d13
@@ -22,8 +22,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}/alix-switchd ${WRKBUILD}/alix-switchd.c
-- 
cgit v1.2.3