diff options
| author | David S. Miller <davem@davemloft.net> | 2010-06-26 19:27:00 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-26 19:27:00 +0200 |
| commit | c67dda14389205f0a223c5089307495290939b3b (patch) | |
| tree | fad0bb26b28703d02a22ebdd44d94eabac4a2ade /drivers/video/tcx.c | |
| parent | sparc64: fix the build error due to smp_kgdb_capture_client() (diff) | |
| parent | Linux 2.6.35-rc3 (diff) | |
| download | linux-c67dda14389205f0a223c5089307495290939b3b.tar.xz linux-c67dda14389205f0a223c5089307495290939b3b.zip | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/video/tcx.c')
| -rw-r--r-- | drivers/video/tcx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/tcx.c b/drivers/video/tcx.c index ef7a7bd8b503..cc039b33d2d8 100644 --- a/drivers/video/tcx.c +++ b/drivers/video/tcx.c @@ -365,7 +365,7 @@ static void tcx_unmap_regs(struct of_device *op, struct fb_info *info, static int __devinit tcx_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 tcx_par *par; int linebytes, i, err; |