patch-2.3.18 linux/drivers/net/eepro100.c

• Lines: 22
• Date: Wed Sep 8 11:51:22 1999
• Orig file: v2.3.17/linux/drivers/net/eepro100.c
• Orig date: Wed Aug 18 11:36:42 1999

diff -u --recursive --new-file v2.3.17/linux/drivers/net/eepro100.c linux/drivers/net/eepro100.c
@@ -94,7 +94,7 @@
 #include <linux/bios32.h>		/* Ignore the bogus warning in 2.1.100+ */
 #endif
 #endif
-#include <asm/spinlock.h>
+#include <linux/spinlock.h>
 #include <asm/bitops.h>
 #include <asm/io.h>
 
@@ -583,10 +583,10 @@
 #endif
 		/* Remove I/O space marker in bit 0. */
 		if (pciaddr & 1) {
-			ioaddr = pciaddr & ~3;
+			ioaddr = pciaddr & ~3UL;
 			if (check_region(ioaddr, 32))
 				continue;
-		} else if ((ioaddr = (long)ioremap(pciaddr & ~0xf, 0x1000)) == 0) {
+		} else if ((ioaddr = (long)ioremap(pciaddr & ~0xfUL, 0x1000)) == 0) {
 			printk(KERN_INFO "Failed to map PCI address %#x.\n",
 				   pciaddr);
 			continue;