diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-02-28 16:04:46 -0500 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-02-28 16:04:46 -0500 |
| commit | 6d4915f4f289e9452d5df136a185ee3edc67c943 (patch) | |
| tree | f2b46c700f5a0a3a0c5b7f89c762b7ebcd56d0f8 /arch/arm/mach-omap2/mailbox.c | |
| parent | 9a577aa8d55f8607e6f5ea6fb9d52780930d8373 (diff) | |
| parent | 02fa9f0451ac639a687bfc145eefe58703ff220e (diff) | |
Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into linaro-2.6.38linaro-linux-2.6.38-upstream-01Mar2011
Diffstat (limited to 'arch/arm/mach-omap2/mailbox.c')
| -rw-r--r-- | arch/arm/mach-omap2/mailbox.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c index 394413dc7de..0a585dfa987 100644 --- a/arch/arm/mach-omap2/mailbox.c +++ b/arch/arm/mach-omap2/mailbox.c @@ -334,7 +334,7 @@ static struct omap_mbox mbox_iva_info = { .priv = &omap2_mbox_iva_priv, }; -struct omap_mbox *omap2_mboxes[] = { &mbox_iva_info, &mbox_dsp_info, NULL }; +struct omap_mbox *omap2_mboxes[] = { &mbox_dsp_info, &mbox_iva_info, NULL }; #endif #if defined(CONFIG_ARCH_OMAP4) |