projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libata: dev_config does not need ap and adev passing
[powerpc.git]
/
drivers
/
video
/
imxfb.c
diff --git
a/drivers/video/imxfb.c
b/drivers/video/imxfb.c
index
5924cc2
..
267c1ff
100644
(file)
--- a/
drivers/video/imxfb.c
+++ b/
drivers/video/imxfb.c
@@
-18,10
+18,8
@@
//#define DEBUG 1
//#define DEBUG 1
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/sched.h>
#include <linux/errno.h>
#include <linux/string.h>
#include <linux/interrupt.h>
#include <linux/errno.h>
#include <linux/string.h>
#include <linux/interrupt.h>
@@
-554,7
+552,7
@@
static int __init imxfb_probe(struct platform_device *pdev)
inf = pdev->dev.platform_data;
if(!inf) {
inf = pdev->dev.platform_data;
if(!inf) {
- dev_err(dev,"No platform_data available\n");
+ dev_err(
&pdev->
dev,"No platform_data available\n");
return -ENOMEM;
}
return -ENOMEM;
}
@@
-579,7
+577,7
@@
static int __init imxfb_probe(struct platform_device *pdev)
if (!inf->fixed_screen_cpu) {
ret = imxfb_map_video_memory(info);
if (ret) {
if (!inf->fixed_screen_cpu) {
ret = imxfb_map_video_memory(info);
if (ret) {
- dev_err(dev, "Failed to allocate video RAM: %d\n", ret);
+ dev_err(
&pdev->
dev, "Failed to allocate video RAM: %d\n", ret);
ret = -ENOMEM;
goto failed_map;
}
ret = -ENOMEM;
goto failed_map;
}
@@
-608,7
+606,7
@@
static int __init imxfb_probe(struct platform_device *pdev)
imxfb_set_par(info);
ret = register_framebuffer(info);
if (ret < 0) {
imxfb_set_par(info);
ret = register_framebuffer(info);
if (ret < 0) {
- dev_err(dev, "failed to register framebuffer\n");
+ dev_err(
&pdev->
dev, "failed to register framebuffer\n");
goto failed_register;
}
goto failed_register;
}