diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-01 23:20:55 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-01 23:20:55 -0500 |
| commit | de2d3dbd17e6bb60bde4632ce1c7df063b073934 (patch) | |
| tree | dfccb1a2717a8a042a87dbade509f894810ea1cd /drivers/net/tokenring/skisa.c | |
| parent | 104dd65fef378773ec0510c788bd4b5ad6ea1121 (diff) | |
| parent | df70b17f88a4d1d8545d3569a1f6d28c6004f9e4 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/net/tokenring/skisa.c')
| -rw-r--r-- | drivers/net/tokenring/skisa.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/tokenring/skisa.c b/drivers/net/tokenring/skisa.c index 3c7c66204f74..72cf708396be 100644 --- a/drivers/net/tokenring/skisa.c +++ b/drivers/net/tokenring/skisa.c | |||
| @@ -36,6 +36,7 @@ static const char version[] = "skisa.c: v1.03 09/12/2002 by Jochen Friedrich\n"; | |||
| 36 | #include <linux/init.h> | 36 | #include <linux/init.h> |
| 37 | #include <linux/netdevice.h> | 37 | #include <linux/netdevice.h> |
| 38 | #include <linux/trdevice.h> | 38 | #include <linux/trdevice.h> |
| 39 | #include <linux/platform_device.h> | ||
| 39 | 40 | ||
| 40 | #include <asm/system.h> | 41 | #include <asm/system.h> |
| 41 | #include <asm/io.h> | 42 | #include <asm/io.h> |