diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /arch/arm/mach-mx2/pca100.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'arch/arm/mach-mx2/pca100.c')
| -rw-r--r-- | arch/arm/mach-mx2/pca100.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx2/pca100.c b/arch/arm/mach-mx2/pca100.c index fe5b165b88c..aea3d340d2e 100644 --- a/arch/arm/mach-mx2/pca100.c +++ b/arch/arm/mach-mx2/pca100.c | |||
| @@ -237,7 +237,7 @@ MACHINE_START(PCA100, "phyCARD-i.MX27") | |||
| 237 | .io_pg_offst = ((AIPI_BASE_ADDR_VIRT) >> 18) & 0xfffc, | 237 | .io_pg_offst = ((AIPI_BASE_ADDR_VIRT) >> 18) & 0xfffc, |
| 238 | .boot_params = PHYS_OFFSET + 0x100, | 238 | .boot_params = PHYS_OFFSET + 0x100, |
| 239 | .map_io = mx27_map_io, | 239 | .map_io = mx27_map_io, |
| 240 | .init_irq = mxc_init_irq, | 240 | .init_irq = mx27_init_irq, |
| 241 | .init_machine = pca100_init, | 241 | .init_machine = pca100_init, |
| 242 | .timer = &pca100_timer, | 242 | .timer = &pca100_timer, |
| 243 | MACHINE_END | 243 | MACHINE_END |