aboutsummaryrefslogtreecommitdiff
path: root/drivers/video/riva/fbdev.c
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-10-04 02:16:24 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-04 07:55:24 -0700
commit0271eb947db2704a0ff8be68d72915ab021d1ead (patch)
tree5fe268cd25a9541b9d71470c07cda062ef27c1c1 /drivers/video/riva/fbdev.c
parent237fead619984cc48818fe12ee0ceada3f55b012 (diff)
[PATCH] fbdev: riva warning fix
drivers/video/riva/fbdev.c: In function `riva_get_EDID_OF': drivers/video/riva/fbdev.c:1846: warning: assignment discards qualifiers from pointer target type This code is being bad: copying a pointer to read-only OF data into a non-const pointer. Cc: Paul Mackerras <paulus@samba.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: "Antonino A. Daplas" <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/riva/fbdev.c')
-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 b120896c8ab..a433cc78ef9 100644
--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c
@@ -1843,7 +1843,7 @@ static int __devinit riva_get_EDID_OF(struct fb_info *info, struct pci_dev *pd)
for (i = 0; propnames[i] != NULL; ++i) {
pedid = get_property(dp, propnames[i], NULL);
if (pedid != NULL) {
- par->EDID = pedid;
+ par->EDID = (unsigned char *)pedid;
NVTRACE("LCD found.\n");
return 1;
}