From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 May 2014 11:40:49 +0200 Subject: resolve merge conflict --- package/bcm2835-vc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/bcm2835-vc') diff --git a/package/bcm2835-vc/Makefile b/package/bcm2835-vc/Makefile index a14efdb28..eb36770c6 100644 --- a/package/bcm2835-vc/Makefile +++ b/package/bcm2835-vc/Makefile @@ -9,7 +9,7 @@ PKG_VERSION:= 0.6 PKG_RELEASE:= 1 PKG_MD5SUM:= 06ef68599607e3f041ded24d431ca460 PKG_DESCR:= videocore tools and libraries for raspberry pi -PKG_SECTION:= base +PKG_SECTION:= libs/video PKG_DEPENDS:= libpthread PKG_BUILDDEP:= cmake-host PKG_URL:= https://github.com/raspberrypi/userland -- cgit v1.2.3