diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-07-28 04:30:20 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-07-28 04:30:20 -0400 |
| commit | 661299d9d0437a0ff72240f3d60016ac3a361a6e (patch) | |
| tree | 765512576314fc3612b503f182b9ae4e60fcf849 /drivers/video/riva/fbdev.c | |
| parent | 05caac585f8abd6c0113856bc8858e3ef214d8a6 (diff) | |
| parent | 41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af (diff) | |
Merge with Linus' 2.6 tree
Diffstat (limited to 'drivers/video/riva/fbdev.c')
| -rw-r--r-- | drivers/video/riva/fbdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c index 6a9e183be41b..ae297e222681 100644 --- a/drivers/video/riva/fbdev.c +++ b/drivers/video/riva/fbdev.c | |||
| @@ -1826,7 +1826,7 @@ static void __devinit riva_get_EDID(struct fb_info *info, struct pci_dev *pdev) | |||
| 1826 | #ifdef CONFIG_PPC_OF | 1826 | #ifdef CONFIG_PPC_OF |
| 1827 | if (!riva_get_EDID_OF(info, pdev)) | 1827 | if (!riva_get_EDID_OF(info, pdev)) |
| 1828 | printk(PFX "could not retrieve EDID from OF\n"); | 1828 | printk(PFX "could not retrieve EDID from OF\n"); |
| 1829 | #elif CONFIG_FB_RIVA_I2C | 1829 | #elif defined(CONFIG_FB_RIVA_I2C) |
| 1830 | if (!riva_get_EDID_i2c(info)) | 1830 | if (!riva_get_EDID_i2c(info)) |
| 1831 | printk(PFX "could not retrieve EDID from DDC/I2C\n"); | 1831 | printk(PFX "could not retrieve EDID from DDC/I2C\n"); |
| 1832 | #endif | 1832 | #endif |