projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'rmobile-fixes-for-linus' of git://github.com/pmundt/linux-sh into renes...
[deliverable/linux.git]
/
arch
/
arm
/
mach-shmobile
/
board-mackerel.c
diff --git
a/arch/arm/mach-shmobile/board-mackerel.c
b/arch/arm/mach-shmobile/board-mackerel.c
index 71d279150471c3641d86bff26fa53859798fd586..55da7a1159127f776c252ce8c2479795155ee7db 100644
(file)
--- a/
arch/arm/mach-shmobile/board-mackerel.c
+++ b/
arch/arm/mach-shmobile/board-mackerel.c
@@
-1335,15
+1335,6
@@
static struct i2c_board_info i2c1_devices[] = {
},
};
},
};
-static void __init mackerel_map_io(void)
-{
- sh7372_map_io();
- /* DMA memory at 0xff200000 - 0xffdfffff. The default 2MB size isn't
- * enough to allocate the frame buffer memory.
- */
- init_consistent_dma_size(12 << 20);
-}
-
#define GPIO_PORT9CR 0xE6051009
#define GPIO_PORT10CR 0xE605100A
#define GPIO_PORT167CR 0xE60520A7
#define GPIO_PORT9CR 0xE6051009
#define GPIO_PORT10CR 0xE605100A
#define GPIO_PORT167CR 0xE60520A7
@@
-1563,7
+1554,7
@@
static void __init mackerel_init(void)
}
MACHINE_START(MACKEREL, "mackerel")
}
MACHINE_START(MACKEREL, "mackerel")
- .map_io =
mackerel
_map_io,
+ .map_io =
sh7372
_map_io,
.init_early = sh7372_add_early_devices,
.init_irq = sh7372_init_irq,
.handle_irq = shmobile_handle_irq_intc,
.init_early = sh7372_add_early_devices,
.init_irq = sh7372_init_irq,
.handle_irq = shmobile_handle_irq_intc,
This page took
0.029209 seconds
and
5
git commands to generate.