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.open-osd.org/linux-open-osd
[pandora-kernel.git]
/
arch
/
arm
/
mach-imx
/
mach-scb9328.c
diff --git
a/arch/arm/mach-imx/mach-scb9328.c
b/arch/arm/mach-imx/mach-scb9328.c
index
88bf0d1
..
1fbdd3f
100644
(file)
--- a/
arch/arm/mach-imx/mach-scb9328.c
+++ b/
arch/arm/mach-imx/mach-scb9328.c
@@
-95,7
+95,7
@@
static struct platform_device dm9000x_device = {
}
};
}
};
-static int mxc_uart1_pins[] = {
+static
const
int mxc_uart1_pins[] = {
PC9_PF_UART1_CTS,
PC10_PF_UART1_RTS,
PC11_PF_UART1_TXD,
PC9_PF_UART1_CTS,
PC10_PF_UART1_RTS,
PC11_PF_UART1_TXD,
@@
-147,8
+147,6
@@
static struct sys_timer scb9328_timer = {
MACHINE_START(SCB9328, "Synertronixx scb9328")
/* Sascha Hauer */
MACHINE_START(SCB9328, "Synertronixx scb9328")
/* Sascha Hauer */
- .phys_io = 0x00200000,
- .io_pg_offst = ((0xe0200000) >> 18) & 0xfffc,
.boot_params = 0x08000100,
.map_io = mx1_map_io,
.init_irq = mx1_init_irq,
.boot_params = 0x08000100,
.map_io = mx1_map_io,
.init_irq = mx1_init_irq,