diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-01-29 10:43:17 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-01-29 10:43:17 +0100 |
| commit | 4cb73288b195dc04c1f604c38bd4ebd2081db9fa (patch) | |
| tree | 7aa025e7a48994aaaeec659b46d246c224a42a25 /arch/arm/mach-mx3 | |
| parent | 70c91a384918736afee13104eea059cc7c8728a1 (diff) | |
| parent | 66ddfc62caec65a25fd5a8b20f535a2958ee94e6 (diff) | |
| download | op-kernel-dev-4cb73288b195dc04c1f604c38bd4ebd2081db9fa.zip op-kernel-dev-4cb73288b195dc04c1f604c38bd4ebd2081db9fa.tar.gz | |
Merge branch 'mxc-rc' into mxc-master
Diffstat (limited to 'arch/arm/mach-mx3')
| -rw-r--r-- | arch/arm/mach-mx3/mach-mx31ads.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-mx3/mach-mx31ads.c b/arch/arm/mach-mx3/mach-mx31ads.c index 286f217..59de378 100644 --- a/arch/arm/mach-mx3/mach-mx31ads.c +++ b/arch/arm/mach-mx3/mach-mx31ads.c @@ -173,6 +173,7 @@ static void expio_unmask_irq(u32 irq) } static struct irq_chip expio_irq_chip = { + .name = "EXPIO(CPLD)", .ack = expio_ack_irq, .mask = expio_mask_irq, .unmask = expio_unmask_irq, @@ -451,6 +452,7 @@ static int mx31_wm8350_init(struct wm8350 *wm8350) static struct wm8350_platform_data __initdata mx31_wm8350_pdata = { .init = mx31_wm8350_init, + .irq_base = MXC_BOARD_IRQ_START + MXC_MAX_EXP_IO_LINES, }; #endif |
