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/ibmveth.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/ibmveth.c')
| -rw-r--r-- | drivers/net/ibmveth.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c index 94239f67f3a3..be191d80ef9c 100644 --- a/drivers/net/ibmveth.c +++ b/drivers/net/ibmveth.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | 35 | ||
| 36 | #include <linux/config.h> | 36 | #include <linux/config.h> |
| 37 | #include <linux/module.h> | 37 | #include <linux/module.h> |
| 38 | #include <linux/version.h> | ||
| 39 | #include <linux/types.h> | 38 | #include <linux/types.h> |
| 40 | #include <linux/errno.h> | 39 | #include <linux/errno.h> |
| 41 | #include <linux/ioport.h> | 40 | #include <linux/ioport.h> |