projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
[cascardo/linux.git]
/
arch
/
arm
/
mach-spear6xx
/
spear6xx.c
diff --git
a/arch/arm/mach-spear6xx/spear6xx.c
b/arch/arm/mach-spear6xx/spear6xx.c
index
9818129
..
e0f6628
100644
(file)
--- a/
arch/arm/mach-spear6xx/spear6xx.c
+++ b/
arch/arm/mach-spear6xx/spear6xx.c
@@
-148,7
+148,7
@@
void __init spear6xx_map_io(void)
iotable_init(spear6xx_io_desc, ARRAY_SIZE(spear6xx_io_desc));
/* This will initialize clock framework */
iotable_init(spear6xx_io_desc, ARRAY_SIZE(spear6xx_io_desc));
/* This will initialize clock framework */
- clk_init();
+
spear6xx_
clk_init();
}
static void __init spear6xx_timer_init(void)
}
static void __init spear6xx_timer_init(void)