1. Replaces a few '#if defined(__i386)' by '#if defined(__i386__)'
2. Adds '#include <asm/delay.h>' to drivers/net/seeq8005.c
3. Adds a typecast in include/linux/sched.h (warning in arch/i386/kernel
init_task.c)
4. Removes a brace in net/802/tr.c
diff -urN linux-pre-2.1.90-3/drivers/net/eepro100.c linux/drivers/net/eepro100.c
--- linux-pre-2.1.90-3/drivers/net/eepro100.c Thu Feb 26 12:44:15 1998
+++ linux/drivers/net/eepro100.c Mon Mar 16 11:44:03 1998
@@ -1348,7 +1348,7 @@
#if (LINUX_VERSION_CODE >= VERSION(1,3,44))
if (! rx_in_place) {
skb_reserve(skb, 2); /* 16 byte align the data fields */
-#if defined(__i386) && notyet
+#if defined(__i386__) && notyet
/* Packet is in one chunk -- we can copy + cksum. */
eth_io_copy_and_sum(skb, bus_to_virt(sp->rx_ringp[entry]->rx_buf_addr),
pkt_len, 0);
diff -urN linux-pre-2.1.90-3/drivers/net/seeq8005.c linux/drivers/net/seeq8005.c
--- linux-pre-2.1.90-3/drivers/net/seeq8005.c Thu Feb 26 12:44:17 1998
+++ linux/drivers/net/seeq8005.c Mon Mar 16 11:44:04 1998
@@ -43,6 +43,7 @@
#include <linux/init.h>
#include <asm/system.h>
#include <asm/bitops.h>
+#include <asm/delay.h>
#include <asm/io.h>
#include <asm/dma.h>
#include <linux/errno.h>
diff -urN linux-pre-2.1.90-3/drivers/net/tulip.c linux/drivers/net/tulip.c
--- linux-pre-2.1.90-3/drivers/net/tulip.c Thu Feb 26 12:42:53 1998
+++ linux/drivers/net/tulip.c Mon Mar 16 11:44:04 1998
@@ -636,7 +636,7 @@
for (i = 0; i < 5; i++)
dev->dev_addr[i] = last_phys_addr[i];
dev->dev_addr[i] = last_phys_addr[i] + 1;
-#if defined(__i386) /* This BIOS bug doesn't exist on Alphas. */
+#if defined(__i386__) /* This BIOS bug doesn't exist on Alphas. */
irq = last_irq;
#endif
}
@@ -1094,7 +1094,7 @@
outl(0x00200000 | 0xE000, ioaddr + CSR0);
#elif defined(__powerpc__)
outl(0x00200080 | 0x8000, ioaddr + CSR0);
-#elif defined(__i386)
+#elif defined(__i386__)
#if defined(MODULE)
/* When a module we don't have 'x86' to check. */
outl(0x00200000 | 0x4800, ioaddr + CSR0);
diff -urN linux-pre-2.1.90-3/drivers/scsi/ncr53c8xx.c linux/drivers/scsi/ncr53c8xx.c
--- linux-pre-2.1.90-3/drivers/scsi/ncr53c8xx.c Tue Jan 13 00:05:27 1998
+++ linux/drivers/scsi/ncr53c8xx.c Mon Mar 16 11:44:05 1998
@@ -9448,7 +9448,7 @@
/*
* Try to fix up PCI config according to wished features.
*/
-#if defined(__i386) && !defined(MODULE)
+#if defined(__i386__) && !defined(MODULE)
if ((driver_setup.pci_fix_up & 1) &&
(chip->features & FE_CLSE) && cache_line_size == 0) {
#if LINUX_VERSION_CODE < LinuxVersionCode(2,1,75)
diff -urN linux-pre-2.1.90-3/include/linux/sched.h linux/include/linux/sched.h
--- linux-pre-2.1.90-3/include/linux/sched.h Mon Mar 16 09:09:42 1998
+++ linux/include/linux/sched.h Mon Mar 16 11:57:14 1998
@@ -135,7 +135,7 @@
#define INIT_FILES { \
1, \
NR_OPEN, \
- &init_fd_array[0], \
+ (struct file **)init_fd_array, \
{ { 0, } }, \
{ { 0, } } \
}
diff -urN linux-pre-2.1.90-3/net/802/tr.c linux/net/802/tr.c
--- linux-pre-2.1.90-3/net/802/tr.c Mon Mar 16 09:08:51 1998
+++ linux/net/802/tr.c Mon Mar 16 11:44:05 1998
@@ -532,4 +532,3 @@
proc_net_register(&tr_rif_proc);
#endif
}
-}
--
Med venlig hilsen / Best regards
nkbj@image.dk
Niels Kristian Bech Jensen http://www.image.dk/~nkbj/
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu