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

(limited to 'package/p54-firmware')

diff --git a/package/p54-firmware/Makefile b/package/p54-firmware/Makefile
index 120f14d2e..72fc56ae2 100644
--- a/package/p54-firmware/Makefile
+++ b/package/p54-firmware/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:=		p54-firmware
 PKG_VERSION:=		1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		8e8ab005a4f8f0123bcdc51bc25b47f6
-PKG_DESCR:=		firmware for USB prism54 wireless cards (isl3887)
-PKG_SECTION:=		wifi
+PKG_DESCR:=		firmware for usb prism54 wireless cards
+PKG_SECTION:=		sys/firmware
 PKG_SITES:=		http://daemonizer.de/prism54/prism54-fw/fw-usb/
 
 DISTFILES:=		2.13.24.0.lm87.arm
-- 
cgit v1.2.3