git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to Fedora Core 2 kernel-2.6.8-1.521
[linux-2.6.git]
/
drivers
/
video
/
aty
/
radeon_pm.c
diff --git
a/drivers/video/aty/radeon_pm.c
b/drivers/video/aty/radeon_pm.c
index
9ab6811
..
c26f43c
100644
(file)
--- a/
drivers/video/aty/radeon_pm.c
+++ b/
drivers/video/aty/radeon_pm.c
@@
-922,7
+922,7
@@
int radeonfb_pci_resume(struct pci_dev *pdev)
/* Restore display & engine */
radeonfb_set_par(info);
fb_pan_display(info, &info->var);
- fb_set_cmap(&info->cmap,
1,
info);
+ fb_set_cmap(&info->cmap, info);
/* Refresh */
fb_set_suspend(info, 0);