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/pcmcia-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
board-h4.c
diff --git
a/arch/arm/mach-omap2/board-h4.c
b/arch/arm/mach-omap2/board-h4.c
index
bac7933
..
45de2b3
100644
(file)
--- a/
arch/arm/mach-omap2/board-h4.c
+++ b/
arch/arm/mach-omap2/board-h4.c
@@
-298,7
+298,7
@@
static void __init omap_h4_init_early(void)
static void __init omap_h4_init_irq(void)
{
static void __init omap_h4_init_irq(void)
{
- omap_init_irq();
+ omap
2
_init_irq();
}
static struct at24_platform_data m24c01 = {
}
static struct at24_platform_data m24c01 = {
@@
-388,5
+388,5
@@
MACHINE_START(OMAP_H4, "OMAP2420 H4 board")
.init_early = omap_h4_init_early,
.init_irq = omap_h4_init_irq,
.init_machine = omap_h4_init,
.init_early = omap_h4_init_early,
.init_irq = omap_h4_init_irq,
.init_machine = omap_h4_init,
- .timer = &omap_timer,
+ .timer = &omap
2
_timer,
MACHINE_END
MACHINE_END