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 /net/ethernet | |
| 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 'net/ethernet')
| -rw-r--r-- | net/ethernet/pe2.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ethernet/pe2.c b/net/ethernet/pe2.c index 98a494be6039..9d57b4fb6440 100644 --- a/net/ethernet/pe2.c +++ b/net/ethernet/pe2.c | |||
| @@ -32,8 +32,7 @@ struct datalink_proto *make_EII_client(void) | |||
| 32 | 32 | ||
| 33 | void destroy_EII_client(struct datalink_proto *dl) | 33 | void destroy_EII_client(struct datalink_proto *dl) |
| 34 | { | 34 | { |
| 35 | if (dl) | 35 | kfree(dl); |
| 36 | kfree(dl); | ||
| 37 | } | 36 | } |
| 38 | 37 | ||
| 39 | EXPORT_SYMBOL(destroy_EII_client); | 38 | EXPORT_SYMBOL(destroy_EII_client); |