fsl-diu-db: compile fix

jeffmahoney · torvalds · commit f969c5672b16 · 2008-06-12T07:55:02.000-07:00
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 &lt;jeffm@suse.com&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
diff --git 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;
 

Original file line number	Diff line number	Diff line change
`@@ -1320,7 +1320,7 @@ static void free_irq_local(int irq)`
`1320`	`1320`	`* Power management hooks. Note that we won't be called from IRQ context,`
`1321`	`1321`	`* unlike the blank functions above, so we may sleep.`
`1322`	`1322`	`*/`
`1323`		`-static int fsl_diu_suspend(struct of_device *dev, pm_message_t state)`
	`1323`	`+static int fsl_diu_suspend(struct of_device *ofdev, pm_message_t state)`
`1324`	`1324`	`{`
`1325`	`1325`	`struct fsl_diu_data *machine_data;`
`1326`	`1326`
`@@ -1330,7 +1330,7 @@ static int fsl_diu_suspend(struct of_device *dev, pm_message_t state)`
`1330`	`1330`	`return 0;`
`1331`	`1331`	`}`
`1332`	`1332`
`1333`		`-static int fsl_diu_resume(struct of_device *dev)`
	`1333`	`+static int fsl_diu_resume(struct of_device *ofdev)`
`1334`	`1334`	`{`
`1335`	`1335`	`struct fsl_diu_data *machine_data;`
`1336`	`1336`