summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2008-06-12 08:05:26 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-06-12 16:55:02 +0200
commitf969c5672b16b857e5231ad3c78f08d8ef3305aa (patch)
tree1c6f348079ddbf9103ee77bf2abaf52670a63857 /drivers
parentMerge branch 'core/iter-div' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff)
downloadlinux-f969c5672b16b857e5231ad3c78f08d8ef3305aa.tar.xz
linux-f969c5672b16b857e5231ad3c78f08d8ef3305aa.zip
fsl-diu-db: compile fix
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>
Diffstat (limited to '')
-rw-r--r--drivers/video/fsl-diu-fb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c
index b50bb03cb5ab..0a2785361ca3 100644
--- a/drivers/video/fsl-diu-fb.c
+++ b/drivers/video/fsl-diu-fb.c
@@ -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;