diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2006-09-23 13:21:35 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-23 14:34:43 -0400 |
| commit | 79da342c31ea839277060c1d2086aaf3b5cd85a4 (patch) | |
| tree | 3d4accf576a5a063afbae009678917021bafd3fb /drivers/video | |
| parent | 4ac493b1d5bfd332f3dee64baaa620961bab6cdc (diff) | |
[PATCH] more get_property() fallout
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video')
| -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 61a4665fb486..4acde4f7dbf8 100644 --- a/drivers/video/riva/fbdev.c +++ b/drivers/video/riva/fbdev.c | |||
| @@ -1826,7 +1826,7 @@ static int __devinit riva_get_EDID_OF(struct fb_info *info, struct pci_dev *pd) | |||
| 1826 | { | 1826 | { |
| 1827 | struct riva_par *par = info->par; | 1827 | struct riva_par *par = info->par; |
| 1828 | struct device_node *dp; | 1828 | struct device_node *dp; |
| 1829 | unsigned char *pedid = NULL; | 1829 | const unsigned char *pedid = NULL; |
| 1830 | const unsigned char *disptype = NULL; | 1830 | const unsigned char *disptype = NULL; |
| 1831 | static char *propnames[] = { | 1831 | static char *propnames[] = { |
| 1832 | "DFP,EDID", "LCD,EDID", "EDID", "EDID1", "EDID,B", "EDID,A", NULL }; | 1832 | "DFP,EDID", "LCD,EDID", "EDID", "EDID1", "EDID,B", "EDID,A", NULL }; |