netfilter: xtables: symmetric COMPAT_XT_ALIGN definition

[safe/jmp/linux-2.6] / drivers / video / q40fb.c

diff --git a/drivers/video/q40fb.c b/drivers/video/q40fb.c
index bfc41f2..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>
@@ -86,9 +85,8 @@ static struct fb_ops q40fb_ops = {
        .fb_imageblit   = cfb_imageblit,
 };
 
-static int __init q40fb_probe(struct device *device)
+static int __init q40fb_probe(struct platform_device *dev)
 {
-       struct platform_device *dev = to_platform_device(device);
        struct fb_info *info;
 
        if (!MACH_IS_Q40)
@@ -97,7 +95,7 @@ static int __init q40fb_probe(struct device *device)
        /* 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;
 
@@ -128,10 +126,11 @@ static int __init q40fb_probe(struct device *device)
        return 0;
 }
 
-static struct device_driver q40fb_driver = {
-       .name   = "q40fb",
-       .bus    = &platform_bus_type,
+static struct platform_driver q40fb_driver = {
        .probe  = q40fb_probe,
+       .driver = {
+               .name   = "q40fb",
+       },
 };
 
 static struct platform_device q40fb_device = {
@@ -145,12 +144,12 @@ int __init q40fb_init(void)
        if (fb_get_options("q40fb", NULL))
                return -ENODEV;
 
-       ret = driver_register(&q40fb_driver);
+       ret = platform_driver_register(&q40fb_driver);
 
        if (!ret) {
                ret = platform_device_register(&q40fb_device);
                if (ret)
-                       driver_unregister(&q40fb_driver);
+                       platform_driver_unregister(&q40fb_driver);
        }
        return ret;
 }