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/oprofile/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/oprofile/Makefile') diff --git a/package/oprofile/Makefile b/package/oprofile/Makefile index 1bce40812..4b741ff6d 100644 --- a/package/oprofile/Makefile +++ b/package/oprofile/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 4 PKG_MD5SUM:= 00aec1287da2dfffda17a9b1c0a01868 PKG_DESCR:= system-wide profiles PKG_SECTION:= debug -PKG_DEPENDS:= libpopt kmod-oprofile libbfd libstdcxx +PKG_DEPENDS:= libpopt libbfd libstdcxx PKG_BUILDDEP:= popt binutils gcc PKG_URL:= http://oprofile.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=oprofile/} -- cgit v1.2.3