diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:50:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:50:19 -0400 |
| commit | df6d3916f3b7b7e2067567a256dd4f0c1ea854a2 (patch) | |
| tree | 0fdeab1ab5d566605fc99aeb5ea3f621f11e7608 /drivers/video/riva | |
| parent | 74add80cbd7fe246c893b93ee75ac59acdd01dd4 (diff) | |
| parent | 197686dfe0038fd190326d118b743ff65ad20c0e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (77 commits)
[POWERPC] Abolish powerpc_flash_init()
[POWERPC] Early serial debug support for PPC44x
[POWERPC] Support for the Ebony 440GP reference board in arch/powerpc
[POWERPC] Add device tree for Ebony
[POWERPC] Add powerpc/platforms/44x, disable platforms/4xx for now
[POWERPC] MPIC U3/U4 MSI backend
[POWERPC] MPIC MSI allocator
[POWERPC] Enable MSI mappings for MPIC
[POWERPC] Tell Phyp we support MSI
[POWERPC] RTAS MSI implementation
[POWERPC] PowerPC MSI infrastructure
[POWERPC] Rip out the existing powerpc msi stubs
[POWERPC] Remove use of 4level-fixup.h for ppc32
[POWERPC] Add powerpc PCI-E reset API implementation
[POWERPC] Holly bootwrapper
[POWERPC] Holly DTS
[POWERPC] Holly defconfig
[POWERPC] Add support for 750CL Holly board
[POWERPC] Generalize tsi108 PCI setup
[POWERPC] Generalize tsi108 PHY types
...
Fixed conflict in include/asm-powerpc/kdebug.h manually
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/riva')
| -rw-r--r-- | drivers/video/riva/fbdev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c index 19dff8dbe8af..0fe547842c64 100644 --- a/drivers/video/riva/fbdev.c +++ b/drivers/video/riva/fbdev.c | |||
| @@ -1760,13 +1760,13 @@ static int __devinit riva_get_EDID_OF(struct fb_info *info, struct pci_dev *pd) | |||
| 1760 | NVTRACE_ENTER(); | 1760 | NVTRACE_ENTER(); |
| 1761 | dp = pci_device_to_OF_node(pd); | 1761 | dp = pci_device_to_OF_node(pd); |
| 1762 | for (; dp != NULL; dp = dp->child) { | 1762 | for (; dp != NULL; dp = dp->child) { |
| 1763 | disptype = get_property(dp, "display-type", NULL); | 1763 | disptype = of_get_property(dp, "display-type", NULL); |
| 1764 | if (disptype == NULL) | 1764 | if (disptype == NULL) |
| 1765 | continue; | 1765 | continue; |
| 1766 | if (strncmp(disptype, "LCD", 3) != 0) | 1766 | if (strncmp(disptype, "LCD", 3) != 0) |
| 1767 | continue; | 1767 | continue; |
| 1768 | for (i = 0; propnames[i] != NULL; ++i) { | 1768 | for (i = 0; propnames[i] != NULL; ++i) { |
| 1769 | pedid = get_property(dp, propnames[i], NULL); | 1769 | pedid = of_get_property(dp, propnames[i], NULL); |
| 1770 | if (pedid != NULL) { | 1770 | if (pedid != NULL) { |
| 1771 | par->EDID = (unsigned char *)pedid; | 1771 | par->EDID = (unsigned char *)pedid; |
| 1772 | NVTRACE("LCD found.\n"); | 1772 | NVTRACE("LCD found.\n"); |