Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

[linux-2.6-omap-h63xx.git] / drivers / video / tmiofb.c

diff --git a/drivers/video/tmiofb.c b/drivers/video/tmiofb.c
index 7baf2dd12d5024f33b5e7af20f6288085e573b9c..a1eb0862255b2e4e51cffa93bf644a99d1ab7b9d 100644 (file)
--- a/drivers/video/tmiofb.c
+++ b/drivers/video/tmiofb.c
@@ -751,7 +751,7 @@ static int __devinit tmiofb_probe(struct platform_device *dev)
        }
 
        retval = request_irq(irq, &tmiofb_irq, IRQF_DISABLED,
-                                       dev->dev.bus_id, info);
+                                       dev_name(&dev->dev), info);
 
        if (retval)
                goto err_request_irq;