diff options
author | Olof Johansson <olof@lixom.net> | 2013-02-11 09:21:44 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-02-11 09:21:44 -0800 |
commit | 5f48a29f1721736930b7817b430039c1d348dd05 (patch) | |
tree | 69c47c1105d275810123785a947227b9aa8028d6 /arch/arm/mach-w90x900/nuc9xx.h | |
parent | 3ad06d1a7dfd99a2e8f3a41e0fa5118551186d3c (diff) | |
parent | f8060f5446b1f2782f0a8ca9be2d870ea4198aee (diff) | |
download | talos-op-linux-5f48a29f1721736930b7817b430039c1d348dd05.tar.gz talos-op-linux-5f48a29f1721736930b7817b430039c1d348dd05.zip |
Merge branch 'depends/cleanup' into next/virt
Diffstat (limited to 'arch/arm/mach-w90x900/nuc9xx.h')
-rw-r--r-- | arch/arm/mach-w90x900/nuc9xx.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-w90x900/nuc9xx.h b/arch/arm/mach-w90x900/nuc9xx.h index 91acb4047793..88ef4b267089 100644 --- a/arch/arm/mach-w90x900/nuc9xx.h +++ b/arch/arm/mach-w90x900/nuc9xx.h @@ -15,10 +15,9 @@ * */ struct map_desc; -struct sys_timer; /* core initialisation functions */ extern void nuc900_init_irq(void); -extern struct sys_timer nuc900_timer; +extern void nuc900_timer_init(void); extern void nuc9xx_restart(char, const char *); |