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 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
[pandora-kernel.git]
/
arch
/
alpha
/
include
/
asm
/
perf_event.h
diff --git
a/arch/alpha/include/asm/perf_event.h
b/arch/alpha/include/asm/perf_event.h
index
fe792ca
..
5996e7a
100644
(file)
--- a/
arch/alpha/include/asm/perf_event.h
+++ b/
arch/alpha/include/asm/perf_event.h
@@
-1,10
+1,4
@@
#ifndef __ASM_ALPHA_PERF_EVENT_H
#define __ASM_ALPHA_PERF_EVENT_H
-#ifdef CONFIG_PERF_EVENTS
-extern void init_hw_perf_events(void);
-#else
-static inline void init_hw_perf_events(void) { }
-#endif
-
#endif /* __ASM_ALPHA_PERF_EVENT_H */