diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2011-10-24 15:02:37 -0400 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2011-10-24 15:02:37 -0400 |
| commit | 3a8254364277fabe01bc0e12b9691722939f5ef3 (patch) | |
| tree | 0befa43780509144cc840f767859006409e0506d /arch/arm/mach-pxa/em-x270.c | |
| parent | 976d167615b64e14bc1491ca51d424e2ba9a5e84 (diff) | |
| parent | 34471a9168c8bfd7f0d00989a7b0797ad27d585e (diff) | |
Merge remote-tracking branch 'rmk/devel-stable' into HEAD
Diffstat (limited to 'arch/arm/mach-pxa/em-x270.c')
| -rw-r--r-- | arch/arm/mach-pxa/em-x270.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c index 2e37ea52b372..94acc0b01dd6 100644 --- a/arch/arm/mach-pxa/em-x270.c +++ b/arch/arm/mach-pxa/em-x270.c | |||
| @@ -1299,7 +1299,7 @@ static void __init em_x270_init(void) | |||
| 1299 | } | 1299 | } |
| 1300 | 1300 | ||
| 1301 | MACHINE_START(EM_X270, "Compulab EM-X270") | 1301 | MACHINE_START(EM_X270, "Compulab EM-X270") |
| 1302 | .boot_params = 0xa0000100, | 1302 | .atag_offset = 0x100, |
| 1303 | .map_io = pxa27x_map_io, | 1303 | .map_io = pxa27x_map_io, |
| 1304 | .init_irq = pxa27x_init_irq, | 1304 | .init_irq = pxa27x_init_irq, |
| 1305 | .handle_irq = pxa27x_handle_irq, | 1305 | .handle_irq = pxa27x_handle_irq, |
| @@ -1308,7 +1308,7 @@ MACHINE_START(EM_X270, "Compulab EM-X270") | |||
| 1308 | MACHINE_END | 1308 | MACHINE_END |
| 1309 | 1309 | ||
| 1310 | MACHINE_START(EXEDA, "Compulab eXeda") | 1310 | MACHINE_START(EXEDA, "Compulab eXeda") |
| 1311 | .boot_params = 0xa0000100, | 1311 | .atag_offset = 0x100, |
| 1312 | .map_io = pxa27x_map_io, | 1312 | .map_io = pxa27x_map_io, |
| 1313 | .init_irq = pxa27x_init_irq, | 1313 | .init_irq = pxa27x_init_irq, |
| 1314 | .handle_irq = pxa27x_handle_irq, | 1314 | .handle_irq = pxa27x_handle_irq, |