patch-2.3.13 linux/drivers/video/imsttfb.c

Next file: linux/drivers/video/macfb.c
Previous file: linux/drivers/video/igafb.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.12/linux/drivers/video/imsttfb.c linux/drivers/video/imsttfb.c
@@ -967,8 +967,8 @@
 	add_timer(&c->timer);
 }
 
-__initfunc(static void
-imstt_cursor_init (struct fb_info_imstt *p))
+static void __init 
+imstt_cursor_init (struct fb_info_imstt *p)
 {
 	struct imstt_cursor *c = &p->cursor;
 
@@ -1728,8 +1728,8 @@
 	out_le32(&p->dc_regs[STGCTL], ctrl);
 }
 
-__initfunc(static void
-init_imstt(struct fb_info_imstt *p))
+static void __init 
+init_imstt(struct fb_info_imstt *p)
 {
 	__u32 i, tmp;
 	__u32 *ip, *end;
@@ -1802,7 +1802,7 @@
 	p->fix.smem_start = (__u8 *)p->frame_buffer_phys;
 	p->fix.smem_len = p->total_vram;
 	p->fix.mmio_start = (__u8 *)p->dc_regs_phys;
-	p->fix.mmio_len = 0x40000;
+	p->fix.mmio_len = 0x1000;
 	p->fix.accel = FB_ACCEL_IMS_TWINTURBO;
 	p->fix.type = FB_TYPE_PACKED_PIXELS;
 	p->fix.visual = p->disp.var.bits_per_pixel == 8 ? FB_VISUAL_PSEUDOCOLOR
@@ -1868,8 +1868,8 @@
 }
 
 #if defined(CONFIG_FB_OF) && !defined(MODULE)
-__initfunc(void
-imsttfb_of_init(struct device_node *dp))
+void __init 
+imsttfb_of_init(struct device_node *dp)
 {
 	struct fb_info_imstt *p;
 	int i;
@@ -1912,8 +1912,8 @@
 }
 #endif
 
-__initfunc(void
-imsttfb_init(void))
+void __init 
+imsttfb_init(void)
 {
 #if defined(CONFIG_FB_OF) && !defined(MODULE)
 	/* We don't want to be called like this. */
@@ -1969,8 +1969,8 @@
 }
 
 #ifndef MODULE
-__initfunc(void
-imsttfb_setup(char *options, int *ints))
+void __init 
+imsttfb_setup(char *options, int *ints)
 {
 	char *this_opt;
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)