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/brodo/cpupowerutils
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap1
/
board-ams-delta.c
diff --git
a/arch/arm/mach-omap1/board-ams-delta.c
b/arch/arm/mach-omap1/board-ams-delta.c
index
f49ce85
..
312ea6b
100644
(file)
--- a/
arch/arm/mach-omap1/board-ams-delta.c
+++ b/
arch/arm/mach-omap1/board-ams-delta.c
@@
-138,7
+138,7
@@
void ams_delta_latch2_write(u16 mask, u16 value)
static void __init ams_delta_init_irq(void)
{
omap1_init_common_hw();
static void __init ams_delta_init_irq(void)
{
omap1_init_common_hw();
- omap_init_irq();
+ omap
1
_init_irq();
}
static struct map_desc ams_delta_io_desc[] __initdata = {
}
static struct map_desc ams_delta_io_desc[] __initdata = {
@@
-391,7
+391,7
@@
MACHINE_START(AMS_DELTA, "Amstrad E3 (Delta)")
.reserve = omap_reserve,
.init_irq = ams_delta_init_irq,
.init_machine = ams_delta_init,
.reserve = omap_reserve,
.init_irq = ams_delta_init_irq,
.init_machine = ams_delta_init,
- .timer = &omap_timer,
+ .timer = &omap
1
_timer,
MACHINE_END
EXPORT_SYMBOL(ams_delta_latch1_write);
MACHINE_END
EXPORT_SYMBOL(ams_delta_latch1_write);