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/jejb/scsi-rc-fixes-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-vexpress
/
v2m.c
diff --git
a/arch/arm/mach-vexpress/v2m.c
b/arch/arm/mach-vexpress/v2m.c
index
817f0ad
..
7eaa232
100644
(file)
--- a/
arch/arm/mach-vexpress/v2m.c
+++ b/
arch/arm/mach-vexpress/v2m.c
@@
-48,7
+48,7
@@
void __init v2m_map_io(struct map_desc *tile, size_t num)
}
-static void v2m_timer_init(void)
+static void
__init
v2m_timer_init(void)
{
writel(0, MMIO_P2V(V2M_TIMER0) + TIMER_CTRL);
writel(0, MMIO_P2V(V2M_TIMER1) + TIMER_CTRL);