Merge branch 'v2.6.35-omap-mailbox-for-next' of git://gitorious.org/~doyu/lk/mainline into omap-for-linus

Conflicts:
	arch/arm/mach-omap1/devices.c

1 files changed, 5 insertions, 1 deletions

diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 162a9be3cbb1..2dbb265bedd4 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -152,10 +152,12 @@ static struct resource omap2_mbox_resources[] = {
         {
                 .start          = INT_24XX_MAIL_U0_MPU,
                 .flags          = IORESOURCE_IRQ,
+                .name           = "dsp",
         },
         {
                 .start          = INT_24XX_MAIL_U3_MPU,
                 .flags          = IORESOURCE_IRQ,
+                .name           = "iva",
         },
 };
 static int omap2_mbox_resources_sz = ARRAY_SIZE(omap2_mbox_resources);
@@ -174,6 +176,7 @@ static struct resource omap3_mbox_resources[] = {
         {
                 .start          = INT_24XX_MAIL_U0_MPU,
                 .flags          = IORESOURCE_IRQ,
+                .name           = "dsp",
         },
 };
 static int omap3_mbox_resources_sz = ARRAY_SIZE(omap3_mbox_resources);
@@ -195,6 +198,7 @@ static struct resource omap4_mbox_resources[] = {
         {
                 .start          = OMAP44XX_IRQ_MAIL_U0,
                 .flags          = IORESOURCE_IRQ,
+                .name           = "mbox",
         },
 };
 static int omap4_mbox_resources_sz = ARRAY_SIZE(omap4_mbox_resources);
@@ -204,7 +208,7 @@ static int omap4_mbox_resources_sz = ARRAY_SIZE(omap4_mbox_resources);
 #endif
 
 static struct platform_device mbox_device = {
-        .name           = "omap2-mailbox",
+        .name           = "omap-mailbox",
         .id             = -1,
 };