diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-19 17:06:36 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-19 17:06:36 -0400 |
| commit | 809b4e00baf006a990a73329ba381d536c6fa277 (patch) | |
| tree | e949e0efd019d6f932537aba762792b07a84351c /arch/arm/mach-pxa/hx4700.c | |
| parent | a0a55682b83fd5f012afadcf415b030d7424ae68 (diff) | |
| parent | 79a94c3538bda6869d7bb150b5e02dd3a72314dd (diff) | |
Merge branch 'devel-stable' into devel
Diffstat (limited to 'arch/arm/mach-pxa/hx4700.c')
| -rw-r--r-- | arch/arm/mach-pxa/hx4700.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/hx4700.c b/arch/arm/mach-pxa/hx4700.c index 848c861dd23f..10104f16e6e4 100644 --- a/arch/arm/mach-pxa/hx4700.c +++ b/arch/arm/mach-pxa/hx4700.c | |||
| @@ -874,6 +874,7 @@ MACHINE_START(H4700, "HP iPAQ HX4700") | |||
| 874 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | 874 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, |
| 875 | .boot_params = 0xa0000100, | 875 | .boot_params = 0xa0000100, |
| 876 | .map_io = pxa_map_io, | 876 | .map_io = pxa_map_io, |
| 877 | .nr_irqs = HX4700_NR_IRQS, | ||
| 877 | .init_irq = pxa27x_init_irq, | 878 | .init_irq = pxa27x_init_irq, |
| 878 | .init_machine = hx4700_init, | 879 | .init_machine = hx4700_init, |
| 879 | .timer = &pxa_timer, | 880 | .timer = &pxa_timer, |