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 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
[pandora-kernel.git]
/
arch
/
arm
/
include
/
asm
/
smp_twd.h
diff --git
a/arch/arm/include/asm/smp_twd.h
b/arch/arm/include/asm/smp_twd.h
index
634f357
..
fed9981
100644
(file)
--- a/
arch/arm/include/asm/smp_twd.h
+++ b/
arch/arm/include/asm/smp_twd.h
@@
-22,7
+22,6
@@
struct clock_event_device;
extern void __iomem *twd_base;
extern void __iomem *twd_base;
-void twd_timer_stop(void);
int twd_timer_ack(void);
void twd_timer_setup(struct clock_event_device *);
int twd_timer_ack(void);
void twd_timer_setup(struct clock_event_device *);