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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
board-ti8168evm.c
diff --git
a/arch/arm/mach-omap2/board-ti8168evm.c
b/arch/arm/mach-omap2/board-ti8168evm.c
index
09fa7bf
..
a85d5b0
100644
(file)
--- a/
arch/arm/mach-omap2/board-ti8168evm.c
+++ b/
arch/arm/mach-omap2/board-ti8168evm.c
@@
-33,11
+33,6
@@
static void __init ti8168_init_early(void)
omap2_init_common_devices(NULL, NULL);
}
omap2_init_common_devices(NULL, NULL);
}
-static void __init ti8168_evm_init_irq(void)
-{
- omap_init_irq();
-}
-
static void __init ti8168_evm_init(void)
{
omap_serial_init();
static void __init ti8168_evm_init(void)
{
omap_serial_init();
@@
-56,7
+51,7
@@
MACHINE_START(TI8168EVM, "ti8168evm")
.boot_params = 0x80000100,
.map_io = ti8168_evm_map_io,
.init_early = ti8168_init_early,
.boot_params = 0x80000100,
.map_io = ti8168_evm_map_io,
.init_early = ti8168_init_early,
- .init_irq = ti816
8_evm
_init_irq,
- .timer = &omap_timer,
+ .init_irq = ti816
x
_init_irq,
+ .timer = &omap
3
_timer,
.init_machine = ti8168_evm_init,
MACHINE_END
.init_machine = ti8168_evm_init,
MACHINE_END