From 61ebf4f27d0a058677c399c854ec6e220542fe9a Mon Sep 17 00:00:00 2001 From: Timur Tabi Date: Thu, 15 Sep 2011 16:44:53 -0500 Subject: [PATCH] --- yaml --- r: 271321 b: refs/heads/master c: f8c6bf6ae677663adbf91b882755e3f757fb1669 h: refs/heads/master i: 271319: 3581a6e53fade252b13ed19113a863ab552c081b v: v3 --- [refs] | 2 +- trunk/drivers/video/fsl-diu-fb.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 56e2f3a08a34..f0610273fed1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bada04fcda8bd2a2bfd5519a6a7265ec9896b435 +refs/heads/master: f8c6bf6ae677663adbf91b882755e3f757fb1669 diff --git a/trunk/drivers/video/fsl-diu-fb.c b/trunk/drivers/video/fsl-diu-fb.c index 4d22399be177..19bfbf5bb980 100644 --- a/trunk/drivers/video/fsl-diu-fb.c +++ b/trunk/drivers/video/fsl-diu-fb.c @@ -1274,7 +1274,7 @@ static int request_irq_local(int irq) /* Read to clear the status */ in_be32(&hw->int_status); - ret = request_irq(irq, fsl_diu_isr, 0, "diu", NULL); + ret = request_irq(irq, fsl_diu_isr, 0, "fsl-diu-fb", NULL); if (!ret) { ints = INT_PARERR | INT_LS_BF_VS; #if !defined(CONFIG_NOT_COHERENT_CACHE) @@ -1634,7 +1634,7 @@ MODULE_DEVICE_TABLE(of, fsl_diu_match); static struct platform_driver fsl_diu_driver = { .driver = { - .name = "fsl_diu", + .name = "fsl-diu-fb", .owner = THIS_MODULE, .of_match_table = fsl_diu_match, },