X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fvideo%2Fasiliantfb.c;fp=drivers%2Fvideo%2Fasiliantfb.c;h=c924d81f7978f2b01ee391afa38e3461357ab0b1;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=1fd22f460b0fa23e990cced9abe9c26f66b04791;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/drivers/video/asiliantfb.c b/drivers/video/asiliantfb.c
index 1fd22f460..c924d81f7 100644
--- a/drivers/video/asiliantfb.c
+++ b/drivers/video/asiliantfb.c
@@ -29,11 +29,13 @@
  *  more details.
  */
 
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
+#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
@@ -351,6 +353,8 @@ struct chips_init_reg {
 	unsigned char data;
 };
 
+#define N_ELTS(x)	(sizeof(x) / sizeof(x[0]))
+
 static struct chips_init_reg chips_init_sr[] =
 {
 	{0x00, 0x03},		/* Reset register */
@@ -456,22 +460,22 @@ static void __devinit chips_hw_init(struct fb_info *p)
 {
 	int i;
 
-	for (i = 0; i < ARRAY_SIZE(chips_init_xr); ++i)
+	for (i = 0; i < N_ELTS(chips_init_xr); ++i)
 		write_xr(chips_init_xr[i].addr, chips_init_xr[i].data);
 	write_xr(0x81, 0x12);
 	write_xr(0x82, 0x08);
 	write_xr(0x20, 0x00);
-	for (i = 0; i < ARRAY_SIZE(chips_init_sr); ++i)
+	for (i = 0; i < N_ELTS(chips_init_sr); ++i)
 		write_sr(chips_init_sr[i].addr, chips_init_sr[i].data);
-	for (i = 0; i < ARRAY_SIZE(chips_init_gr); ++i)
+	for (i = 0; i < N_ELTS(chips_init_gr); ++i)
 		write_gr(chips_init_gr[i].addr, chips_init_gr[i].data);
-	for (i = 0; i < ARRAY_SIZE(chips_init_ar); ++i)
+	for (i = 0; i < N_ELTS(chips_init_ar); ++i)
 		write_ar(chips_init_ar[i].addr, chips_init_ar[i].data);
 	/* Enable video output in attribute index register */
 	writeb(0x20, mmio_base + 0x780);
-	for (i = 0; i < ARRAY_SIZE(chips_init_cr); ++i)
+	for (i = 0; i < N_ELTS(chips_init_cr); ++i)
 		write_cr(chips_init_cr[i].addr, chips_init_cr[i].data);
-	for (i = 0; i < ARRAY_SIZE(chips_init_fr); ++i)
+	for (i = 0; i < N_ELTS(chips_init_fr); ++i)
 		write_fr(chips_init_fr[i].addr, chips_init_fr[i].data);
 }