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

(limited to 'package/scsi-spin')

diff --git a/package/scsi-spin/Makefile b/package/scsi-spin/Makefile
index 6ea1f433e..667dc670b 100644
--- a/package/scsi-spin/Makefile
+++ b/package/scsi-spin/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:=		scsi-spin
 PKG_VERSION:=		1.0
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		d0c32bfc500e94cc1905d9457a99cdbb
-PKG_DESCR:=		Utility to spin down scsi disks
-PKG_SECTION:=		misc
+PKG_DESCR:=		utility to spin down scsi disks
+PKG_SECTION:=		sys/fs
 
 NO_DISTFILES:=		1
 
@@ -20,8 +20,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}/scsi-spin ${WRKBUILD}/scsi-spin.c
-- 
cgit v1.2.3