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/ebiederm/linux-2.6-nsfd
[pandora-kernel.git]
/
arch
/
arm
/
mach-spear6xx
/
include
/
mach
/
generic.h
diff --git
a/arch/arm/mach-spear6xx/include/mach/generic.h
b/arch/arm/mach-spear6xx/include/mach/generic.h
index
94cf4a6
..
183f023
100644
(file)
--- a/
arch/arm/mach-spear6xx/include/mach/generic.h
+++ b/
arch/arm/mach-spear6xx/include/mach/generic.h
@@
-39,7
+39,7
@@
void __init spear6xx_map_io(void);
void __init spear6xx_init_irq(void);
void __init spear6xx_init(void);
void __init spear600_init(void);
void __init spear6xx_init_irq(void);
void __init spear6xx_init(void);
void __init spear600_init(void);
-void __init clk_init(void);
+void __init
spear6xx_
clk_init(void);
/* Add spear600 machine device structure declarations here */
/* Add spear600 machine device structure declarations here */