diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-18 10:20:21 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-18 10:20:21 -0400 |
| commit | 7f9c7e28119cf21ae1a035240da3705647d0d06a (patch) | |
| tree | c0a1568e21c5ce6cd4112e44071040a3e611a9ec /arch/arm/mach-pxa/pcm027.c | |
| parent | 4af8f24d99d119ed68b27d1b0bd6f2ab2b23ed1b (diff) | |
| parent | b476ef059ec9e49d4f2a4280b862b446ef3866e8 (diff) | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/mach-pxa/pcm027.c')
| -rw-r--r-- | arch/arm/mach-pxa/pcm027.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/pcm027.c b/arch/arm/mach-pxa/pcm027.c index 2190af066470..90b08ba8ad1a 100644 --- a/arch/arm/mach-pxa/pcm027.c +++ b/arch/arm/mach-pxa/pcm027.c | |||
| @@ -262,6 +262,7 @@ MACHINE_START(PCM027, "Phytec Messtechnik GmbH phyCORE-PXA270") | |||
| 262 | .phys_io = 0x40000000, | 262 | .phys_io = 0x40000000, |
| 263 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | 263 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, |
| 264 | .map_io = pcm027_map_io, | 264 | .map_io = pcm027_map_io, |
| 265 | .nr_irqs = PCM027_NR_IRQS, | ||
| 265 | .init_irq = pxa27x_init_irq, | 266 | .init_irq = pxa27x_init_irq, |
| 266 | .timer = &pxa_timer, | 267 | .timer = &pxa_timer, |
| 267 | .init_machine = pcm027_init, | 268 | .init_machine = pcm027_init, |