patch-2.4.2 linux/drivers/s390/net/ctc.c

• Lines: 28
• Date: Tue Feb 13 14:13:44 2001
• Orig file: v2.4.1/linux/drivers/s390/net/ctc.c
• Orig date: Mon Dec 11 12:39:45 2000

diff -u --recursive --new-file v2.4.1/linux/drivers/s390/net/ctc.c linux/drivers/s390/net/ctc.c
@@ -46,7 +46,7 @@
 #include <linux/version.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/interrupt.h>
@@ -128,7 +128,8 @@
  *
  */  
 
-static int channel_tab_initialized = 0;     /* channel[] structure initialized */
+/* long req'd by set_bit --RR */
+static long channel_tab_initialized = 0;     /* channel[] structure initialized */
 
 struct devicelist {  
         unsigned int  devno;
@@ -394,7 +395,7 @@
         int        m;
         int        c;
         int        irq;
-        dev_info_t temp;
+        s390_dev_info_t temp;
         
         for (m = 0; m < CHANNEL_MEDIA;  m++) { 
                 for (c = 0; c < MAX_CHANNEL_DEVICES; c++){