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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
[pandora-kernel.git]
/
arch
/
arm
/
include
/
asm
/
localtimer.h
diff --git
a/arch/arm/include/asm/localtimer.h
b/arch/arm/include/asm/localtimer.h
index
6bc63ab
..
080d74f
100644
(file)
--- a/
arch/arm/include/asm/localtimer.h
+++ b/
arch/arm/include/asm/localtimer.h
@@
-44,8
+44,14
@@
int local_timer_ack(void);
/*
* Setup a local timer interrupt for a CPU.
*/
/*
* Setup a local timer interrupt for a CPU.
*/
-
void
local_timer_setup(struct clock_event_device *);
+
int
local_timer_setup(struct clock_event_device *);
+#else
+
+static inline int local_timer_setup(struct clock_event_device *evt)
+{
+ return -ENXIO;
+}
#endif
#endif
#endif
#endif