]> err.no Git - linux-2.6/commitdiff
fsl-diu-db: compile fix
authorJeff Mahoney <jeffm@suse.com>
Thu, 12 Jun 2008 06:05:26 +0000 (02:05 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Jun 2008 14:55:02 +0000 (07:55 -0700)
This patch fixes a compile failure in 2.6.26-rc5-git5.

The variable is expected to be called ofdev.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/video/fsl-diu-fb.c

index b50bb03cb5ab2da72e35d958844f573659f96b47..0a2785361ca3541681fead9c9a5b1838f784178c 100644 (file)
@@ -1320,7 +1320,7 @@ static void free_irq_local(int irq)
  * Power management hooks. Note that we won't be called from IRQ context,
  * unlike the blank functions above, so we may sleep.
  */
-static int fsl_diu_suspend(struct of_device *dev, pm_message_t state)
+static int fsl_diu_suspend(struct of_device *ofdev, pm_message_t state)
 {
        struct fsl_diu_data *machine_data;
 
@@ -1330,7 +1330,7 @@ static int fsl_diu_suspend(struct of_device *dev, pm_message_t state)
        return 0;
 }
 
-static int fsl_diu_resume(struct of_device *dev)
+static int fsl_diu_resume(struct of_device *ofdev)
 {
        struct fsl_diu_data *machine_data;