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-pxa/eseries.c | |
| parent | fcd467137ea2da46ffe5cbfdb42e8a2b35f13dad (diff) | |
| parent | a26bce1220a4c5a7a074a779e6aad3cae63a94f7 (diff) | |
Merge branch 'depends/rmk/devel-stable' into imx/imx6q
Diffstat (limited to 'arch/arm/mach-pxa/eseries.c')
| -rw-r--r-- | arch/arm/mach-pxa/eseries.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-pxa/eseries.c b/arch/arm/mach-pxa/eseries.c index b4599ec9d61..e823c54057f 100644 --- a/arch/arm/mach-pxa/eseries.c +++ b/arch/arm/mach-pxa/eseries.c | |||
| @@ -189,7 +189,7 @@ static void __init e330_init(void) | |||
| 189 | 189 | ||
| 190 | MACHINE_START(E330, "Toshiba e330") | 190 | MACHINE_START(E330, "Toshiba e330") |
| 191 | /* Maintainer: Ian Molton (spyro@f2s.com) */ | 191 | /* Maintainer: Ian Molton (spyro@f2s.com) */ |
| 192 | .boot_params = 0xa0000100, | 192 | .atag_offset = 0x100, |
| 193 | .map_io = pxa25x_map_io, | 193 | .map_io = pxa25x_map_io, |
| 194 | .nr_irqs = ESERIES_NR_IRQS, | 194 | .nr_irqs = ESERIES_NR_IRQS, |
| 195 | .init_irq = pxa25x_init_irq, | 195 | .init_irq = pxa25x_init_irq, |
| @@ -239,7 +239,7 @@ static void __init e350_init(void) | |||
| 239 | 239 | ||
| 240 | MACHINE_START(E350, "Toshiba e350") | 240 | MACHINE_START(E350, "Toshiba e350") |
| 241 | /* Maintainer: Ian Molton (spyro@f2s.com) */ | 241 | /* Maintainer: Ian Molton (spyro@f2s.com) */ |
| 242 | .boot_params = 0xa0000100, | 242 | .atag_offset = 0x100, |
| 243 | .map_io = pxa25x_map_io, | 243 | .map_io = pxa25x_map_io, |
| 244 | .nr_irqs = ESERIES_NR_IRQS, | 244 | .nr_irqs = ESERIES_NR_IRQS, |
| 245 | .init_irq = pxa25x_init_irq, | 245 | .init_irq = pxa25x_init_irq, |
| @@ -362,7 +362,7 @@ static void __init e400_init(void) | |||
| 362 | 362 | ||
| 363 | MACHINE_START(E400, "Toshiba e400") | 363 | MACHINE_START(E400, "Toshiba e400") |
| 364 | /* Maintainer: Ian Molton (spyro@f2s.com) */ | 364 | /* Maintainer: Ian Molton (spyro@f2s.com) */ |
| 365 | .boot_params = 0xa0000100, | 365 | .atag_offset = 0x100, |
| 366 | .map_io = pxa25x_map_io, | 366 | .map_io = pxa25x_map_io, |
| 367 | .nr_irqs = ESERIES_NR_IRQS, | 367 | .nr_irqs = ESERIES_NR_IRQS, |
| 368 | .init_irq = pxa25x_init_irq, | 368 | .init_irq = pxa25x_init_irq, |
| @@ -551,7 +551,7 @@ static void __init e740_init(void) | |||
| 551 | 551 | ||
| 552 | MACHINE_START(E740, "Toshiba e740") | 552 | MACHINE_START(E740, "Toshiba e740") |
| 553 | /* Maintainer: Ian Molton (spyro@f2s.com) */ | 553 | /* Maintainer: Ian Molton (spyro@f2s.com) */ |
| 554 | .boot_params = 0xa0000100, | 554 | .atag_offset = 0x100, |
| 555 | .map_io = pxa25x_map_io, | 555 | .map_io = pxa25x_map_io, |
| 556 | .nr_irqs = ESERIES_NR_IRQS, | 556 | .nr_irqs = ESERIES_NR_IRQS, |
| 557 | .init_irq = pxa25x_init_irq, | 557 | .init_irq = pxa25x_init_irq, |
| @@ -743,7 +743,7 @@ static void __init e750_init(void) | |||
| 743 | 743 | ||
| 744 | MACHINE_START(E750, "Toshiba e750") | 744 | MACHINE_START(E750, "Toshiba e750") |
| 745 | /* Maintainer: Ian Molton (spyro@f2s.com) */ | 745 | /* Maintainer: Ian Molton (spyro@f2s.com) */ |
| 746 | .boot_params = 0xa0000100, | 746 | .atag_offset = 0x100, |
| 747 | .map_io = pxa25x_map_io, | 747 | .map_io = pxa25x_map_io, |
| 748 | .nr_irqs = ESERIES_NR_IRQS, | 748 | .nr_irqs = ESERIES_NR_IRQS, |
| 749 | .init_irq = pxa25x_init_irq, | 749 | .init_irq = pxa25x_init_irq, |
| @@ -948,7 +948,7 @@ static void __init e800_init(void) | |||
| 948 | 948 | ||
| 949 | MACHINE_START(E800, "Toshiba e800") | 949 | MACHINE_START(E800, "Toshiba e800") |
| 950 | /* Maintainer: Ian Molton (spyro@f2s.com) */ | 950 | /* Maintainer: Ian Molton (spyro@f2s.com) */ |
| 951 | .boot_params = 0xa0000100, | 951 | .atag_offset = 0x100, |
| 952 | .map_io = pxa25x_map_io, | 952 | .map_io = pxa25x_map_io, |
| 953 | .nr_irqs = ESERIES_NR_IRQS, | 953 | .nr_irqs = ESERIES_NR_IRQS, |
| 954 | .init_irq = pxa25x_init_irq, | 954 | .init_irq = pxa25x_init_irq, |