diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-10-06 17:01:27 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-10-06 17:01:27 +0200 |
| commit | 907bc6c7fc7071b00083fc11e510e47dd93df45d (patch) | |
| tree | 0697a608561522c00da9e1814974a2eb051bb96d /arch/arm/mach-mx3/mx31pdk.c | |
| parent | ASoC: Add virtual enumeration support for DAPM muxes (diff) | |
| parent | Merge branch 'for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/br... (diff) | |
| download | linux-907bc6c7fc7071b00083fc11e510e47dd93df45d.tar.xz linux-907bc6c7fc7071b00083fc11e510e47dd93df45d.zip | |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'arch/arm/mach-mx3/mx31pdk.c')
| -rw-r--r-- | arch/arm/mach-mx3/mx31pdk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx3/mx31pdk.c b/arch/arm/mach-mx3/mx31pdk.c index c19838d2e369..0f7a2f06bc2d 100644 --- a/arch/arm/mach-mx3/mx31pdk.c +++ b/arch/arm/mach-mx3/mx31pdk.c @@ -265,7 +265,7 @@ MACHINE_START(MX31_3DS, "Freescale MX31PDK (3DS)") .io_pg_offst = ((AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc, .boot_params = PHYS_OFFSET + 0x100, .map_io = mx31pdk_map_io, - .init_irq = mxc_init_irq, + .init_irq = mx31_init_irq, .init_machine = mxc_board_init, .timer = &mx31pdk_timer, MACHINE_END |