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.h | |
| 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.h')
| -rw-r--r-- | drivers/net/sk_mca.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/sk_mca.h b/drivers/net/sk_mca.h index 7e7c99582746..d6fa1823dfa6 100644 --- a/drivers/net/sk_mca.h +++ b/drivers/net/sk_mca.h | |||
| @@ -1,5 +1,3 @@ | |||
| 1 | #include <linux/version.h> | ||
| 2 | |||
| 3 | #ifndef _SK_MCA_INCLUDE_ | 1 | #ifndef _SK_MCA_INCLUDE_ |
| 4 | #define _SK_MCA_INCLUDE_ | 2 | #define _SK_MCA_INCLUDE_ |
| 5 | 3 | ||