diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:23:28 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:23:28 -0400 |
| commit | 929f58aeeb46f964d9468ce1addd993f5d92b11d (patch) | |
| tree | 95355731bd4d21d221cdc2a5ab073244ff76db65 /arch/arm/mach-s3c2440/mach-rx3715.c | |
| parent | fcd467137ea2da46ffe5cbfdb42e8a2b35f13dad (diff) | |
| parent | a26bce1220a4c5a7a074a779e6aad3cae63a94f7 (diff) | |
Merge branch 'depends/rmk/devel-stable' into imx/imx6q
Diffstat (limited to 'arch/arm/mach-s3c2440/mach-rx3715.c')
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-rx3715.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2440/mach-rx3715.c b/arch/arm/mach-s3c2440/mach-rx3715.c index 1472b1a5b2fb..e19499c2f909 100644 --- a/arch/arm/mach-s3c2440/mach-rx3715.c +++ b/arch/arm/mach-s3c2440/mach-rx3715.c | |||
| @@ -218,7 +218,7 @@ static void __init rx3715_init_machine(void) | |||
| 218 | 218 | ||
| 219 | MACHINE_START(RX3715, "IPAQ-RX3715") | 219 | MACHINE_START(RX3715, "IPAQ-RX3715") |
| 220 | /* Maintainer: Ben Dooks <ben-linux@fluff.org> */ | 220 | /* Maintainer: Ben Dooks <ben-linux@fluff.org> */ |
| 221 | .boot_params = S3C2410_SDRAM_PA + 0x100, | 221 | .atag_offset = 0x100, |
| 222 | .map_io = rx3715_map_io, | 222 | .map_io = rx3715_map_io, |
| 223 | .reserve = rx3715_reserve, | 223 | .reserve = rx3715_reserve, |
| 224 | .init_irq = rx3715_init_irq, | 224 | .init_irq = rx3715_init_irq, |