]>
Commit | Line | Data |
---|---|---|
b59abc02 | 1 | --- linux/drivers/net/tulip.c~ Thu Feb 26 02:12:20 2004 |
2 | +++ linux/drivers/net/tulip.c Thu Feb 26 02:12:20 2004 | |
3 | @@ -138,12 +138,12 @@ | |
4 | #include <linux/netdevice.h> | |
5 | #include <linux/etherdevice.h> | |
6 | #include <linux/skbuff.h> | |
7 | +#include <linux/delay.h> | |
8 | #include <linux/init.h> | |
9 | #include <asm/processor.h> /* Processor type for cache alignment. */ | |
10 | #include <asm/bitops.h> | |
11 | #include <asm/io.h> | |
12 | #include <asm/unaligned.h> | |
13 | -#include <asm/delay.h> | |
14 | ||
15 | /* Kernel compatibility defines, some common to David Hind's PCMCIA package. | |
16 | This is only in the support-all-kernels source code. */ | |
17 | --- linux/drivers/net/comx-hw-comx.c~ Thu Feb 26 02:20:49 2004 | |
18 | +++ linux/drivers/net/comx-hw-comx.c Thu Feb 26 02:20:49 2004 | |
19 | @@ -48,7 +48,7 @@ | |
20 | ||
21 | #include <asm/uaccess.h> | |
22 | #include <asm/io.h> | |
23 | -#include <asm/delay.h> | |
24 | +#include <linux/delay.h> | |
25 | #include <linux/config.h> | |
26 | #include <linux/module.h> | |
27 | #include <linux/version.h> | |
28 | --- linux/drivers/net/c101.c~ Thu Feb 26 02:22:52 2004 | |
29 | +++ linux/drivers/net/c101.c Thu Feb 26 02:22:52 2004 | |
30 | @@ -26,10 +26,10 @@ | |
31 | #include <linux/types.h> | |
32 | #include <linux/string.h> | |
33 | #include <linux/errno.h> | |
34 | +#include <linux/delay.h> | |
35 | #include <linux/init.h> | |
36 | #include <linux/netdevice.h> | |
37 | #include <asm/io.h> | |
38 | -#include <asm/delay.h> | |
39 | ||
40 | #include "syncppp.h" | |
41 | #include <linux/hdlc.h> |