patch-2.4.2 linux/drivers/net/hamradio/scc.c

• Lines: 18
• Date: Tue Feb 13 13:15:05 2001
• Orig file: v2.4.1/linux/drivers/net/hamradio/scc.c
• Orig date: Sat Feb 3 19:51:28 2001

diff -u --recursive --new-file v2.4.1/linux/drivers/net/hamradio/scc.c linux/drivers/net/hamradio/scc.c
@@ -160,7 +160,7 @@
 #include <linux/in.h>
 #include <linux/fcntl.h>
 #include <linux/ptrace.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/delay.h>
 
 #include <linux/skbuff.h>
@@ -1776,7 +1776,7 @@
 
 			if (hwcfg.vector_latch) {
 				if (!request_region(Vector_Latch, 1, "scc vector latch"))
-					printk(KERN_WARNING "z8530drv: warning, cannot reserve vector latch port 0x%x\n, disabled.", (unsigned int)hwcfg.vector_latch);
+					printk(KERN_WARNING "z8530drv: warning, cannot reserve vector latch port 0x%lx\n, disabled.", hwcfg.vector_latch);
 				else
 					Vector_Latch = hwcfg.vector_latch;
 			}