diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-03 10:17:31 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-03 10:17:31 -0400 |
commit | a652883a244901742d6c9733a9eebdf72e3114ea (patch) | |
tree | 5540eec3287bd9515661d502aaec3a696fefd906 /drivers/video | |
parent | a57ee627499d116f6872a5634ea4f015da0eacd2 (diff) | |
parent | ee227c577cde47f78e2df359f9c32ba047060767 (diff) |
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6
* 'merge' of git://git.secretlab.ca/git/linux-2.6:
of/powerpc: fix fsl_msi device node pointer
of/watchdog: gef_wdt.c: fix build breakage
of/edac: fix build breakage in drivers
of/net: fs_enet/mii-bitbang.c: fix build breakage
of/usb: fsl_qe_udc.c: fix build breakage
of/crypto: crypto4xx_core.c: fix build breakage
of/dma: fix build breakage in ppc4xx adma driver
of/mtd: nand: fix build breakage in drivers
of/video: fix build breakage in FB drivers
of/pcmcia: m8xx_pcmcia.c: Fix build failures
of/rtc: rtc-mpc5121.c: Fix build failures
of/dma: mpc512x_dma.c: Fix build failures
of/mtd/nand: mpc5121_nfc.c: Fix build failures
of/spi: mpc512x_psc_spi.c: Fix build failures
watchdog: Fix build failure with OF changes
of/spi: Fix build failure on spi_ppc4xx.c
of/usb: fix build error due to of_node pointer move
of/powerpc: fix 85xx RapidIO device node pointer
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/bw2.c | 2 | ||||
-rw-r--r-- | drivers/video/cg14.c | 2 | ||||
-rw-r--r-- | drivers/video/cg3.c | 2 | ||||
-rw-r--r-- | drivers/video/leo.c | 2 | ||||
-rw-r--r-- | drivers/video/mb862xx/mb862xxfb.c | 2 | ||||
-rw-r--r-- | drivers/video/p9100.c | 2 | ||||
-rw-r--r-- | drivers/video/tcx.c | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/drivers/video/bw2.c b/drivers/video/bw2.c index 2c371c07f0d..09f1b9b462f 100644 --- a/drivers/video/bw2.c +++ b/drivers/video/bw2.c | |||
@@ -275,7 +275,7 @@ static int __devinit bw2_do_default_mode(struct bw2_par *par, | |||
275 | 275 | ||
276 | static int __devinit bw2_probe(struct of_device *op, const struct of_device_id *match) | 276 | static int __devinit bw2_probe(struct of_device *op, const struct of_device_id *match) |
277 | { | 277 | { |
278 | struct device_node *dp = op->node; | 278 | struct device_node *dp = op->dev.of_node; |
279 | struct fb_info *info; | 279 | struct fb_info *info; |
280 | struct bw2_par *par; | 280 | struct bw2_par *par; |
281 | int linebytes, err; | 281 | int linebytes, err; |
diff --git a/drivers/video/cg14.c b/drivers/video/cg14.c index d12e05b6e63..e5dc2241194 100644 --- a/drivers/video/cg14.c +++ b/drivers/video/cg14.c | |||
@@ -465,7 +465,7 @@ static void cg14_unmap_regs(struct of_device *op, struct fb_info *info, | |||
465 | 465 | ||
466 | static int __devinit cg14_probe(struct of_device *op, const struct of_device_id *match) | 466 | static int __devinit cg14_probe(struct of_device *op, const struct of_device_id *match) |
467 | { | 467 | { |
468 | struct device_node *dp = op->node; | 468 | struct device_node *dp = op->dev.of_node; |
469 | struct fb_info *info; | 469 | struct fb_info *info; |
470 | struct cg14_par *par; | 470 | struct cg14_par *par; |
471 | int is_8mb, linebytes, i, err; | 471 | int is_8mb, linebytes, i, err; |
diff --git a/drivers/video/cg3.c b/drivers/video/cg3.c index b98f93f7f66..558d73a948a 100644 --- a/drivers/video/cg3.c +++ b/drivers/video/cg3.c | |||
@@ -349,7 +349,7 @@ static int __devinit cg3_do_default_mode(struct cg3_par *par) | |||
349 | static int __devinit cg3_probe(struct of_device *op, | 349 | static int __devinit cg3_probe(struct of_device *op, |
350 | const struct of_device_id *match) | 350 | const struct of_device_id *match) |
351 | { | 351 | { |
352 | struct device_node *dp = op->node; | 352 | struct device_node *dp = op->dev.of_node; |
353 | struct fb_info *info; | 353 | struct fb_info *info; |
354 | struct cg3_par *par; | 354 | struct cg3_par *par; |
355 | int linebytes, err; | 355 | int linebytes, err; |
diff --git a/drivers/video/leo.c b/drivers/video/leo.c index 3d7895316ea..9e8bf7d5e24 100644 --- 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, | |||
550 | static int __devinit leo_probe(struct of_device *op, | 550 | static int __devinit leo_probe(struct of_device *op, |
551 | const struct of_device_id *match) | 551 | const struct of_device_id *match) |
552 | { | 552 | { |
553 | struct device_node *dp = op->node; | 553 | struct device_node *dp = op->dev.of_node; |
554 | struct fb_info *info; | 554 | struct fb_info *info; |
555 | struct leo_par *par; | 555 | struct leo_par *par; |
556 | int linebytes, err; | 556 | int linebytes, err; |
diff --git a/drivers/video/mb862xx/mb862xxfb.c b/drivers/video/mb862xx/mb862xxfb.c index 0540de4f5cb..4e2b8cc3d46 100644 --- a/drivers/video/mb862xx/mb862xxfb.c +++ b/drivers/video/mb862xx/mb862xxfb.c | |||
@@ -553,7 +553,7 @@ static int mb862xx_gdc_init(struct mb862xxfb_par *par) | |||
553 | static int __devinit of_platform_mb862xx_probe(struct of_device *ofdev, | 553 | static int __devinit of_platform_mb862xx_probe(struct of_device *ofdev, |
554 | const struct of_device_id *id) | 554 | const struct of_device_id *id) |
555 | { | 555 | { |
556 | struct device_node *np = ofdev->node; | 556 | struct device_node *np = ofdev->dev.of_node; |
557 | struct device *dev = &ofdev->dev; | 557 | struct device *dev = &ofdev->dev; |
558 | struct mb862xxfb_par *par; | 558 | struct mb862xxfb_par *par; |
559 | struct fb_info *info; | 559 | struct fb_info *info; |
diff --git a/drivers/video/p9100.c b/drivers/video/p9100.c index c85dd408a9b..6552751e81a 100644 --- a/drivers/video/p9100.c +++ b/drivers/video/p9100.c | |||
@@ -251,7 +251,7 @@ static void p9100_init_fix(struct fb_info *info, int linebytes, struct device_no | |||
251 | 251 | ||
252 | static int __devinit p9100_probe(struct of_device *op, const struct of_device_id *match) | 252 | static int __devinit p9100_probe(struct of_device *op, const struct of_device_id *match) |
253 | { | 253 | { |
254 | struct device_node *dp = op->node; | 254 | struct device_node *dp = op->dev.of_node; |
255 | struct fb_info *info; | 255 | struct fb_info *info; |
256 | struct p9100_par *par; | 256 | struct p9100_par *par; |
257 | int linebytes, err; | 257 | int linebytes, err; |
diff --git a/drivers/video/tcx.c b/drivers/video/tcx.c index ef7a7bd8b50..cc039b33d2d 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, | |||
365 | static int __devinit tcx_probe(struct of_device *op, | 365 | static int __devinit tcx_probe(struct of_device *op, |
366 | const struct of_device_id *match) | 366 | const struct of_device_id *match) |
367 | { | 367 | { |
368 | struct device_node *dp = op->node; | 368 | struct device_node *dp = op->dev.of_node; |
369 | struct fb_info *info; | 369 | struct fb_info *info; |
370 | struct tcx_par *par; | 370 | struct tcx_par *par; |
371 | int linebytes, i, err; | 371 | int linebytes, i, err; |