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/smc91x.c | |
| parent | 104dd65fef378773ec0510c788bd4b5ad6ea1121 (diff) | |
| parent | df70b17f88a4d1d8545d3569a1f6d28c6004f9e4 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/net/smc91x.c')
| -rw-r--r-- | drivers/net/smc91x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c index c573bb351d4c..74d5f1a6fdea 100644 --- a/drivers/net/smc91x.c +++ b/drivers/net/smc91x.c | |||
| @@ -77,7 +77,7 @@ static const char version[] = | |||
| 77 | #include <linux/errno.h> | 77 | #include <linux/errno.h> |
| 78 | #include <linux/ioport.h> | 78 | #include <linux/ioport.h> |
| 79 | #include <linux/crc32.h> | 79 | #include <linux/crc32.h> |
| 80 | #include <linux/device.h> | 80 | #include <linux/platform_device.h> |
| 81 | #include <linux/spinlock.h> | 81 | #include <linux/spinlock.h> |
| 82 | #include <linux/ethtool.h> | 82 | #include <linux/ethtool.h> |
| 83 | #include <linux/mii.h> | 83 | #include <linux/mii.h> |