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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
arch
/
arm
/
mach-s5p6440
/
cpu.c
diff --git
a/arch/arm/mach-s5p6440/cpu.c
b/arch/arm/mach-s5p6440/cpu.c
index
1794131
..
b2fe6a5
100644
(file)
--- a/
arch/arm/mach-s5p6440/cpu.c
+++ b/
arch/arm/mach-s5p6440/cpu.c
@@
-61,6
+61,7
@@
static void s5p6440_idle(void)
void __init s5p6440_map_io(void)
{
/* initialize any device information early */
void __init s5p6440_map_io(void)
{
/* initialize any device information early */
+ s3c_device_adc.name = "s3c64xx-adc";
}
void __init s5p6440_init_clocks(int xtal)
}
void __init s5p6440_init_clocks(int xtal)
@@
-88,7
+89,7
@@
void __init s5p6440_init_irq(void)
s5p_init_irq(vic, ARRAY_SIZE(vic));
}
s5p_init_irq(vic, ARRAY_SIZE(vic));
}
-st
atic st
ruct sysdev_class s5p6440_sysclass = {
+struct sysdev_class s5p6440_sysclass = {
.name = "s5p6440-core",
};
.name = "s5p6440-core",
};