From bbd13b8fd14d0e945a0e987b75e894dcff5bd7bf Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Fri, 8 Jul 2011 18:34:42 +0100
Subject: [PATCH] --- yaml --- r: 257150 b: refs/heads/master c:
 7fcfd1abd6480d3b9ef17f5759c175e036e835cf h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/oprofile/oprofile_perf.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index aab05582d43f..51356530beb9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ac2e6ca44e13a087eb7438d284f887097ee7e84
+refs/heads/master: 7fcfd1abd6480d3b9ef17f5759c175e036e835cf
diff --git a/trunk/drivers/oprofile/oprofile_perf.c b/trunk/drivers/oprofile/oprofile_perf.c
index 59acf9ef78a4..94796f39bc47 100644
--- a/trunk/drivers/oprofile/oprofile_perf.c
+++ b/trunk/drivers/oprofile/oprofile_perf.c
@@ -31,7 +31,7 @@ static int num_counters;
 /*
  * Overflow callback for oprofile.
  */
-static void op_overflow_handler(struct perf_event *event, int unused,
+static void op_overflow_handler(struct perf_event *event,
 			struct perf_sample_data *data, struct pt_regs *regs)
 {
 	int id;