git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-2.6
[pandora-kernel.git]
/
arch
/
arm
/
include
/
asm
/
pmu.h
diff --git
a/arch/arm/include/asm/pmu.h
b/arch/arm/include/asm/pmu.h
index
7544ce6
..
67c70a3
100644
(file)
--- a/
arch/arm/include/asm/pmu.h
+++ b/
arch/arm/include/asm/pmu.h
@@
-52,7
+52,7
@@
reserve_pmu(enum arm_pmu_type device);
* a cookie.
*/
extern int
* a cookie.
*/
extern int
-release_pmu(
struct platform_device *pdev
);
+release_pmu(
enum arm_pmu_type type
);
/**
* init_pmu() - Initialise the PMU.
/**
* init_pmu() - Initialise the PMU.