vserver 1.9.3

[linux-2.6.git] / drivers / video / leo.c

diff --git a/drivers/video/leo.c b/drivers/video/leo.c
index 7547e89..99fb72a 100644 (file)
--- a/drivers/video/leo.c
+++ b/drivers/video/leo.c
@@ -588,7 +588,7 @@ static void leo_init_one(struct sbus_dev *sdev)
                sbus_ioremap(&sdev->resource[0], LEO_OFF_LX_CURSOR,
                             sizeof(struct leo_cursor), "leolx cursor");
 
-       all->info.flags = FBINFO_FLAG_DEFAULT;
+       all->info.flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN;
        all->info.fbops = &leo_ops;
        all->info.currcon = -1;
        all->info.par = &all->par;
@@ -626,6 +626,9 @@ int __init leo_init(void)
        struct sbus_bus *sbus;
        struct sbus_dev *sdev;
 
+       if (fb_get_options("leofb", NULL))
+               return -ENODEV;
+
        for_all_sbusdev(sdev, sbus) {
                if (!strcmp(sdev->prom_name, "leo"))
                        leo_init_one(sdev);
@@ -654,8 +657,8 @@ leo_setup(char *arg)
        return 0;
 }
 
-#ifdef MODULE
 module_init(leo_init);
+#ifdef MODULE
 module_exit(leo_exit);
 #endif