diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-23 15:57:31 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-23 15:57:31 -0400 |
| commit | a2ab67fae1ab9226679495a8d260f4e6555efc5f (patch) | |
| tree | f7de683c9c8ff0869a7e11f1d40802145d05f5b4 /arch/arm/mach-mx1/scb9328.c | |
| parent | 6d0485a99366d4e0e7e725f14995c74cb7ca4499 (diff) | |
| parent | 135cad366b4e7d6a79f6369f6cb5b721985aa62f (diff) | |
Merge branch 'for-rmk-devel' of git://git.pengutronix.de/git/imx/linux-2.6 into devel
Conflicts:
arch/arm/Kconfig
arch/arm/Makefile
Diffstat (limited to 'arch/arm/mach-mx1/scb9328.c')
| -rw-r--r-- | arch/arm/mach-mx1/scb9328.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx1/scb9328.c b/arch/arm/mach-mx1/scb9328.c index 0e71f3fa28b..20e0b5bcdff 100644 --- a/arch/arm/mach-mx1/scb9328.c +++ b/arch/arm/mach-mx1/scb9328.c | |||
| @@ -153,7 +153,7 @@ MACHINE_START(SCB9328, "Synertronixx scb9328") | |||
| 153 | .phys_io = 0x00200000, | 153 | .phys_io = 0x00200000, |
| 154 | .io_pg_offst = ((0xe0200000) >> 18) & 0xfffc, | 154 | .io_pg_offst = ((0xe0200000) >> 18) & 0xfffc, |
| 155 | .boot_params = 0x08000100, | 155 | .boot_params = 0x08000100, |
| 156 | .map_io = mxc_map_io, | 156 | .map_io = mx1_map_io, |
| 157 | .init_irq = mxc_init_irq, | 157 | .init_irq = mxc_init_irq, |
| 158 | .timer = &scb9328_timer, | 158 | .timer = &scb9328_timer, |
| 159 | .init_machine = scb9328_init, | 159 | .init_machine = scb9328_init, |