patch-2.3.16 linux/arch/mips/baget/setup.c

Next file: linux/arch/mips/baget/time.c
Previous file: linux/arch/mips/baget/prom/init.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.15/linux/arch/mips/baget/setup.c linux/arch/mips/baget/setup.c
@@ -21,7 +21,7 @@
 #define CACHEABLE_STR(val) ((val) ? "not cached" : "cached")
 #define MIN(a,b)           (((a)<(b)) ? (a):(b)) 
 		
-__initfunc(static void vac_show(void))
+static void __init vac_show(void)
 { 
 	int i;
 	unsigned short val, decode = vac_inw(VAC_DECODE_CTRL);
@@ -172,7 +172,7 @@
 	       (VAC_CTRL_DELAY_IOSELI_VAL(val)&1) ? ".5" : "");
 }
 
-__initfunc(static void vac_init(void))
+static void __init vac_init(void)
 {
 	unsigned short mem_limit = ((mips_memory_upper-KSEG0) >> 16);
 
@@ -283,7 +283,7 @@
         vac_show();
 }
 
-__initfunc(static void vac_start(void))
+static void __init vac_start(void)
 {
 	vac_outw(0, VAC_ID);
 	vac_outw(VAC_INT_CTRL_TIMER_DISABLE|
@@ -305,7 +305,7 @@
 	vac_outw((500000/(384*16))<<8,VAC_CPU_CLK_DIV); 
 }
 
-__initfunc(static void vic_show(void))
+static void __init vic_show(void)
 {
 	unsigned char val;
 	char *timeout[]  = { "4", "16", "32", "64", "128", "256", "disabled" };
@@ -364,7 +364,7 @@
 	
 }
 
-__initfunc(static void vic_init(void))
+static void __init vic_init(void)
 {
 	 unsigned char id = vic_inb(VIC_ID);
 	 if ((id & 0xf0) != 0xf0)
@@ -463,7 +463,7 @@
 		 VIC_INT_ENABLE, VIC_LINT7);
 }
 
-__initfunc(void baget_irq_setup(void))
+void __init baget_irq_setup(void)
 {
 	extern void bagetIRQ(void);
 
@@ -475,7 +475,7 @@
 extern void baget_machine_halt(void);
 extern void baget_machine_power_off(void);
  
-__initfunc(void baget_setup(void))
+void __init baget_setup(void)
 {
 	printk("BT23/63-201n found.\n");
 	*BAGET_WRERR_ACK = 0;

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