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 'origin'
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap1
/
board-netstar.c
diff --git
a/arch/arm/mach-omap1/board-netstar.c
b/arch/arm/mach-omap1/board-netstar.c
index
58f7839
..
60d5f8a
100644
(file)
--- a/
arch/arm/mach-omap1/board-netstar.c
+++ b/
arch/arm/mach-omap1/board-netstar.c
@@
-65,6
+65,7
@@
static struct omap_board_config_kernel netstar_config[] = {
static void __init netstar_init_irq(void)
{
+ omap1_init_common_hw();
omap_init_irq();
omap_gpio_init();
}
@@
-108,7
+109,7
@@
static void __init netstar_init(void)
static void __init netstar_map_io(void)
{
- omap_map_common_io();
+ omap
1
_map_common_io();
}
#define MACHINE_PANICED 1