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 'stable-3.2' into pandora-3.2
[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
0bda22c
..
665ef2c
100644
(file)
--- a/
arch/arm/include/asm/pmu.h
+++ b/
arch/arm/include/asm/pmu.h
@@
-125,7
+125,7
@@
int __init armpmu_register(struct arm_pmu *armpmu, char *name, int type);
u64 armpmu_event_update(struct perf_event *event,
struct hw_perf_event *hwc,
- int idx
, int overflow
);
+ int idx);
int armpmu_event_set_period(struct perf_event *event,
struct hw_perf_event *hwc,