From 05d715df3ac052fb41a5ab42369d05a3e2a82de3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 13 May 2014 13:44:08 +0200 Subject: resolve merge conflict --- package/bluez-firmware/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/bluez-firmware') diff --git a/package/bluez-firmware/Makefile b/package/bluez-firmware/Makefile index f19ca1a4e..33d9067f7 100644 --- a/package/bluez-firmware/Makefile +++ b/package/bluez-firmware/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 1cc3cefad872e937e05de5a0a2b390dd PKG_DESCR:= firmware for BCM2033 PKG_SECTION:= misc -PKG_DEPENDS:= kmod-bt bluez +PKG_DEPENDS:= bluez PKG_URL:= http://www.bluez.org/ PKG_SITES:= http://bluez.sourceforge.net/download/ -- cgit v1.2.3