Merge branch 'for-tony-mailbox'

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap1 / devices.c

diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
index 77382d8b6b2f61a4d0c4a93fb4357ba48220d061..b4b6106cc08bd19a651d7c00646e34c8d9ffb159 100644 (file)
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@ -86,7 +86,7 @@ static struct resource mbox_resources[] = {
 };
 
 static struct platform_device mbox_device = {
-       .name           = "mailbox",
+       .name           = "omap1-mailbox",
        .id             = -1,
        .num_resources  = ARRAY_SIZE(mbox_resources),
        .resource       = mbox_resources,