Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

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

diff --git a/drivers/video/cyberfb.c b/drivers/video/cyberfb.c
index 45bbd37..c40e72d 100644 (file)
--- a/drivers/video/cyberfb.c
+++ b/drivers/video/cyberfb.c
@@ -81,7 +81,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/zorro.h>
@@ -1065,7 +1064,6 @@ int __init cyberfb_init(void)
                   fb_info.node, fb_info.modename, CyberSize>>10);
 
            /* TODO: This driver cannot be unloaded yet */
-           MOD_INC_USE_COUNT;
            DPRINTK("EXIT\n");
            return 0;
        }
@@ -1206,14 +1204,6 @@ int init_module(void)
 {
        return cyberfb_init();
 }
-
-void cleanup_module(void)
-{
-       /* Not reached because the usecount will never be
-          decremented to zero */
-       unregister_framebuffer(&fb_info);
-       /* TODO: clean up ... */
-}
 #endif /* MODULE */
 
 /*