summaryrefslogtreecommitdiff
path: root/drivers/video/riva
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2006-09-23 19:44:58 +0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-23 22:34:43 +0400
commit13b5aeccc4350e5069c723e8f9becd7208ee02f2 (patch)
tree84decf7505e98d2e1d7a0935219f8b5e006c04d7 /drivers/video/riva
parentd7b2004528a967f2ba0bf31b1eb0da6a876960e6 (diff)
downloadlinux-13b5aeccc4350e5069c723e8f9becd7208ee02f2.tar.xz
[PATCH] more fallout from get_property returning pointer to const
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/riva')
-rw-r--r--drivers/video/riva/fbdev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
index 67d1e1c8813d..61a4665fb486 100644
--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c
@@ -1827,7 +1827,7 @@ static int __devinit riva_get_EDID_OF(struct fb_info *info, struct pci_dev *pd)
struct riva_par *par = info->par;
struct device_node *dp;
unsigned char *pedid = NULL;
- unsigned char *disptype = NULL;
+ const unsigned char *disptype = NULL;
static char *propnames[] = {
"DFP,EDID", "LCD,EDID", "EDID", "EDID1", "EDID,B", "EDID,A", NULL };
int i;