diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
| commit | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (patch) | |
| tree | 1b7ae51ff681e27118590e9cab4bf0ce38f5d80e /drivers/net/sk_mca.c | |
| parent | e6a04466ba965875a6132700fabb2f2c0249c41a (diff) | |
| parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) | |
Merge by hand (whitespace conflicts in libata.h)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/net/sk_mca.c')
| -rw-r--r-- | drivers/net/sk_mca.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/sk_mca.c b/drivers/net/sk_mca.c index 4c56b8d8221b..e5d6d95960c7 100644 --- a/drivers/net/sk_mca.c +++ b/drivers/net/sk_mca.c | |||
| @@ -93,7 +93,6 @@ History: | |||
| 93 | #include <linux/mca-legacy.h> | 93 | #include <linux/mca-legacy.h> |
| 94 | #include <linux/init.h> | 94 | #include <linux/init.h> |
| 95 | #include <linux/module.h> | 95 | #include <linux/module.h> |
| 96 | #include <linux/version.h> | ||
| 97 | #include <linux/netdevice.h> | 96 | #include <linux/netdevice.h> |
| 98 | #include <linux/etherdevice.h> | 97 | #include <linux/etherdevice.h> |
| 99 | #include <linux/skbuff.h> | 98 | #include <linux/skbuff.h> |