Merge git://oss.sgi.com:8090/xfs/xfs-2.6

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

diff --git a/drivers/video/virgefb.c b/drivers/video/virgefb.c
index ed78747487e2f5587d3382bcb3f7464f34e7f0aa..64378959dd7b09fdcd23f1d4da13e5b2dbc5c7ff 100644 (file)
--- a/drivers/video/virgefb.c
+++ b/drivers/video/virgefb.c
@@ -39,7 +39,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>
@@ -616,8 +615,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: