projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[cascardo/linux.git]
/
drivers
/
video
/
sgivwfb.c
diff --git
a/drivers/video/sgivwfb.c
b/drivers/video/sgivwfb.c
index
ebb6756
..
4fb1624
100644
(file)
--- a/
drivers/video/sgivwfb.c
+++ b/
drivers/video/sgivwfb.c
@@
-752,7
+752,7
@@
static int __init sgivwfb_probe(struct platform_device *dev)
struct fb_info *info;
char *monitor;
- info = framebuffer_alloc(sizeof(struct sgivw_par) + sizeof(u32) *
25
6, &dev->dev);
+ info = framebuffer_alloc(sizeof(struct sgivw_par) + sizeof(u32) *
1
6, &dev->dev);
if (!info)
return -ENOMEM;
par = info->par;