From 5c6a158ee654acda23fab83af074c5d1c779651b Mon Sep 17 00:00:00 2001
From: Mark Rutland <Mark.Rutland@arm.com>
Date: Wed, 10 Aug 2011 10:20:17 +0100
Subject: [PATCH] --- yaml --- r: 263576 b: refs/heads/master c:
 49bef8331afefa4dd75f7124c50bde47168f5492 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/arm/include/asm/pmu.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0e81fe74b9c0..ede222d73c4e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ac8e58f3818795d02ac309bd57b4d93ec283a77
+refs/heads/master: 49bef8331afefa4dd75f7124c50bde47168f5492
diff --git a/trunk/arch/arm/include/asm/pmu.h b/trunk/arch/arm/include/asm/pmu.h
index 67c70a31a1be..8ae32ba092c2 100644
--- a/trunk/arch/arm/include/asm/pmu.h
+++ b/trunk/arch/arm/include/asm/pmu.h
@@ -75,7 +75,7 @@ reserve_pmu(enum arm_pmu_type device)
 }
 
 static inline int
-release_pmu(struct platform_device *pdev)
+release_pmu(enum arm_pmu_type device)
 {
 	return -ENODEV;
 }