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 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
arch
/
arm
/
mach-ns9xxx
/
mach-cc9p9360js.c
diff --git
a/arch/arm/mach-ns9xxx/mach-cc9p9360js.c
b/arch/arm/mach-ns9xxx/mach-cc9p9360js.c
index
d09d5fa
..
85c8b41
100644
(file)
--- a/
arch/arm/mach-ns9xxx/mach-cc9p9360js.c
+++ b/
arch/arm/mach-ns9xxx/mach-cc9p9360js.c
@@
-20,7
+20,7
@@
static void __init mach_cc9p9360js_init_machine(void)
board_jscc9p9360_init_machine();
}
board_jscc9p9360_init_machine();
}
-MACHINE_START(CC9P9360
DEV
, "Digi ConnectCore 9P 9360 on an JSCC9P9360 Devboard")
+MACHINE_START(CC9P9360
JS
, "Digi ConnectCore 9P 9360 on an JSCC9P9360 Devboard")
.map_io = ns9xxx_map_io,
.init_irq = ns9xxx_init_irq,
.init_machine = mach_cc9p9360js_init_machine,
.map_io = ns9xxx_map_io,
.init_irq = ns9xxx_init_irq,
.init_machine = mach_cc9p9360js_init_machine,