diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 10:32:56 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 10:32:56 -0500 |
| commit | 4fd5f8267dd37aaebadfabe71d9c808821eea05a (patch) | |
| tree | 50774592eaba942cf378fca731d307f901b737b7 /drivers/net/smc91x.c | |
| parent | eb16292ba8a6655a560ab10a7d73a7816f0c0ac0 (diff) | |
| parent | 8576762ff5d109b841fcf4e7d3883e0cf794f3cf (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel
Manual #include fixups for clashes - there may be some unnecessary
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> |