Merge with /home/shaggy/git/linus-clean/

[linux-2.6-omap-h63xx.git] / drivers / video / asiliantfb.c

diff --git a/drivers/video/asiliantfb.c b/drivers/video/asiliantfb.c
index c64de59398f499e80507a3e3d582f90d8515bf19..69f75547865df1c799cf427d796672aa73c3ab48 100644 (file)
--- a/drivers/video/asiliantfb.c
+++ b/drivers/video/asiliantfb.c
@@ -549,7 +549,7 @@ asiliantfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent)
        if (!request_mem_region(addr, size, "asiliantfb"))
                return -EBUSY;
 
-       p = framebuffer_alloc(sizeof(u32) * 256, &dp->dev);
+       p = framebuffer_alloc(sizeof(u32) * 16, &dp->dev);
        if (!p) {
                release_mem_region(addr, size);
                return -ENOMEM;