Merge branch 'fix/misc' into for-linus

[pandora-kernel.git] / drivers / video / q40fb.c

diff --git a/drivers/video/q40fb.c b/drivers/video/q40fb.c
index fc91dbf..4beac1d 100644 (file)
--- a/drivers/video/q40fb.c
+++ b/drivers/video/q40fb.c
@@ -14,7 +14,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
@@ -96,7 +95,7 @@ static int __init q40fb_probe(struct platform_device *dev)
        /* mapped in q40/config.c */
        q40fb_fix.smem_start = Q40_PHYS_SCREEN_ADDR;
 
-       info = framebuffer_alloc(sizeof(u32) * 256, &dev->dev);
+       info = framebuffer_alloc(sizeof(u32) * 16, &dev->dev);
        if (!info)
                return -ENOMEM;