git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
of: Always use 'struct device.of_node' to get device node pointer.
[safe/jmp/linux-2.6]
/
drivers
/
video
/
sunxvr1000.c
diff --git
a/drivers/video/sunxvr1000.c
b/drivers/video/sunxvr1000.c
index
a8248c0
..
ad92a20
100644
(file)
--- a/
drivers/video/sunxvr1000.c
+++ b/
drivers/video/sunxvr1000.c
@@
-5,7
+5,6
@@
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/slab.h>
#include <linux/fb.h>
#include <linux/init.h>
#include <linux/of_device.h>
#include <linux/fb.h>
#include <linux/init.h>
#include <linux/of_device.h>
@@
-115,7
+114,7
@@
static int __devinit gfb_set_fbinfo(struct gfb_info *gp)
static int __devinit gfb_probe(struct of_device *op,
const struct of_device_id *match)
{
static int __devinit gfb_probe(struct of_device *op,
const struct of_device_id *match)
{
- struct device_node *dp = op->node;
+ struct device_node *dp = op->
dev.of_
node;
struct fb_info *info;
struct gfb_info *gp;
int err;
struct fb_info *info;
struct gfb_info *gp;
int err;