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

• Lines: 64
• Date: Mon Aug 9 10:25:01 1999
• Orig file: v2.3.12/linux/drivers/video/amifb.c
• Orig date: Tue Jan 19 10:47:48 1999

diff -u --recursive --new-file v2.3.12/linux/drivers/video/amifb.c linux/drivers/video/amifb.c
@@ -1259,8 +1259,7 @@
 	amifb_pan_display, amifb_ioctl
 };
 
-
-__initfunc(void amifb_setup(char *options, int *ints))
+void __init amifb_setup(char *options, int *ints)
 {
 	char *this_opt;
 	char mcap_spec[80];
@@ -1715,7 +1714,7 @@
 	 * Initialisation
 	 */
 
-__initfunc(void amifb_init(void))
+void __init amifb_init(void)
 {
 	int tag, i;
 	u_long chipptr;
@@ -2053,7 +2052,7 @@
 	 * Get a Video Mode
 	 */
 
-__initfunc(static void get_video_mode(const char *name))
+static void __init get_video_mode(const char *name)
 {
 	int i;
 
@@ -2070,7 +2069,7 @@
 	 *  Probe the Video Modes
 	 */
 
-__initfunc(static void check_default_mode(void))
+static void __init check_default_mode(void)
 {
 	struct amifb_par par;
 	int mode;
@@ -2090,7 +2089,7 @@
 	 * Allocate, Clear and Align a Block of Chip Memory
 	 */
 
-__initfunc(static u_long chipalloc(u_long size))
+static u_long __init chipalloc(u_long size)
 {
 	u_long ptr;
 
@@ -2107,7 +2106,7 @@
 	 * A strtok which returns empty strings, too
 	 */
 
-__initfunc(static char *strtoke(char *s,const char *ct))
+static char __init *strtoke(char *s,const char *ct)
 {
 	char *sbegin, *send;
 	static char *ssave = NULL;
@@ -3314,7 +3313,7 @@
 	 * Initialise the Copper Initialisation List
 	 */
 
-__initfunc(static void ami_init_copper(void))
+static void __init ami_init_copper(void)
 {
 	copins *cop = copdisplay.init;
 	u_long p;