git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
[sfrench/cifs-2.6.git]
/
drivers
/
video
/
leo.c
diff --git
a/drivers/video/leo.c
b/drivers/video/leo.c
index 3d7895316eaf37e79bb56f2413d748fcbdfca131..9e8bf7d5e249df2a3d0f3243181bab0b76b633a9 100644
(file)
--- a/
drivers/video/leo.c
+++ b/
drivers/video/leo.c
@@
-550,7
+550,7
@@
static void leo_unmap_regs(struct of_device *op, struct fb_info *info,
static int __devinit leo_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 leo_par *par;
int linebytes, err;