Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/drivers/video/virgefb.c b/drivers/video/virgefb.c
index 8d512fd..5ea2345 100644 (file)
--- a/drivers/video/virgefb.c
+++ b/drivers/video/virgefb.c
@@ -616,8 +616,7 @@ static struct {
 #endif
 };
 
-#define arraysize(x)   (sizeof(x)/sizeof(*(x)))
-#define NUM_TOTAL_MODES        arraysize(virgefb_predefined)
+#define NUM_TOTAL_MODES        ARRAY_SIZE(virgefb_predefined)
 
 /*
  *    Default to 800x600 for video=virge8:, virge16: or virge32:
@@ -1809,7 +1808,6 @@ int __init virgefb_init(void)
 
        /* TODO: This driver cannot be unloaded yet */
 
-       MOD_INC_USE_COUNT;
        DPRINTK("EXIT\n");
        return 0;
 }
@@ -2064,14 +2062,6 @@ int init_module(void)
 {
        return virgefb_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 */
 
 static int cv3d_has_4mb(void)