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/nand/Makefile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'package/nand')

diff --git a/package/nand/Makefile b/package/nand/Makefile
index da66808b0..f6bfd0f96 100644
--- a/package/nand/Makefile
+++ b/package/nand/Makefile
@@ -6,8 +6,8 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		nand
 PKG_VERSION:=		1.0
 PKG_RELEASE:=		3
-PKG_DESCR:=		NAND utility
-PKG_SECTION:=		fs
+PKG_DESCR:=		nand flash utility
+PKG_SECTION:=		sys/fs
 
 PKG_DFLT_NAND:=		y if ADK_TARGET_WITH_NAND
 PKG_CFLINE_NAND:=	depends on ADK_TARGET_WITH_NAND
@@ -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}/nand ${WRKBUILD}/nand.c
-- 
cgit v1.2.3