From: Matt Fleming <matt.fleming@intel.com>
Date: Thu, 26 Feb 2015 18:47:00 +0000 (+0000)
Subject: perf/x86/intel: Fix Makefile to actually build the cqm driver
X-Git-Tag: omap-for-v4.1/fixes-rc1~156^2~51^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e16ed99416ef569a89782a7234f95007919fadd;p=pandora-kernel.git

perf/x86/intel: Fix Makefile to actually build the cqm driver

Someone fat fingered a merge conflict and lost the Makefile hunk.

Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: <acme@redhat.com>
Cc: <hpa@zytor.com>
Cc: <jolsa@redhat.com>
Cc: <kanaka.d.juvva@intel.com>
Cc: <tglx@linutronix.de>
Cc: <torvalds@linux-foundation.org>
Cc: <vikas.shivappa@linux.intel.com>
Link: http://lkml.kernel.org/r/1424976420.15321.35.camel@mfleming-mobl1.ger.corp.intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

Reading git-diff-tree failed