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

• Lines: 96
• Date: Mon Aug 9 10:25:01 1999
• Orig file: v2.3.12/linux/drivers/video/acornfb.c
• Orig date: Thu Jun 17 01:11:35 1999

diff -u --recursive --new-file v2.3.12/linux/drivers/video/acornfb.c linux/drivers/video/acornfb.c
@@ -1429,8 +1429,8 @@
 	}
 };
 
-__initfunc(static int
-acornfb_lookup_timing(struct fb_var_screeninfo *var))
+static int __init 
+acornfb_lookup_timing(struct fb_var_screeninfo *var)
 {
 	const struct modex_params *x;
 	const struct modey_params *y;
@@ -1518,8 +1518,8 @@
 	return 0;
 }
 
-__initfunc(static void
-acornfb_init_fbinfo(void))
+static void __init 
+acornfb_init_fbinfo(void)
 {
 	static int first = 1;
 
@@ -1612,14 +1612,14 @@
  *	size can optionally be followed by 'M' or 'K' for
  *	MB or KB respectively.
  */
-__initfunc(static void
-acornfb_parse_font(char *opt))
+static void __init 
+acornfb_parse_font(char *opt)
 {
 	strcpy(fb_info.fontname, opt);
 }
 
-__initfunc(static void
-acornfb_parse_mon(char *opt))
+static void __init 
+acornfb_parse_mon(char *opt)
 {
 	fb_info.monspecs.hfmin = simple_strtoul(opt, &opt, 0);
 	if (*opt == '-')
@@ -1652,8 +1652,8 @@
 	init_var.height = simple_strtoul(opt + 1, NULL, 0);
 }
 
-__initfunc(static void
-acornfb_parse_montype(char *opt))
+static void __init 
+acornfb_parse_montype(char *opt)
 {
 	current_par.montype = -2;
 
@@ -1694,8 +1694,8 @@
 	}
 }
 
-__initfunc(static void
-acornfb_parse_dram(char *opt))
+static void __init 
+acornfb_parse_dram(char *opt)
 {
 	unsigned int size;
 
@@ -1728,8 +1728,8 @@
 	{ NULL, NULL }
 };
 
-__initfunc(void
-acornfb_setup(char *options, int *ints))
+void __init 
+acornfb_setup(char *options, int *ints)
 {
 	struct options *optp;
 	char *opt;
@@ -1765,8 +1765,8 @@
  * Detect type of monitor connected
  *  For now, we just assume SVGA
  */
-__initfunc(static int
-acornfb_detect_monitortype(void))
+static int __init 
+acornfb_detect_monitortype(void)
 {
 	return 4;
 }
@@ -1802,8 +1802,8 @@
 	printk("acornfb: freed %dK memory\n", mb_freed);
 }
 
-__initfunc(void
-acornfb_init(void))
+void __init 
+acornfb_init(void)
 {
 	unsigned long size;
 	u_int h_sync, v_sync;