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-bootloader/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/bcm2835-bootloader') diff --git a/package/bcm2835-bootloader/Makefile b/package/bcm2835-bootloader/Makefile index aca7b395a..1bc96aee4 100644 --- a/package/bcm2835-bootloader/Makefile +++ b/package/bcm2835-bootloader/Makefile @@ -9,7 +9,7 @@ PKG_VERSION:= 0.8 PKG_RELEASE:= 1 PKG_MD5SUM:= 08beaa7d66e7dd6b0ab58483d0f4ce40 PKG_DESCR:= bootloader for raspberry pi (bcm2835) -PKG_SECTION:= boot +PKG_SECTION:= base/boot PKG_URL:= https://github.com/raspberrypi/firmware PKG_SITES:= http://openadk.org/distfiles/ -- cgit v1.2.3