diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-11-10 08:29:07 -0600 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-11-10 08:29:07 -0600 |
| commit | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (patch) | |
| tree | 1b7ae51ff681e27118590e9cab4bf0ce38f5d80e /drivers/net/gianfar.c | |
| parent | e6a04466ba965875a6132700fabb2f2c0249c41a (diff) | |
| parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) | |
| download | kernel_samsung_smdk4412-8a87a0b6313109d2fea87b1271d497c954ce2ca8.tar.gz kernel_samsung_smdk4412-8a87a0b6313109d2fea87b1271d497c954ce2ca8.tar.bz2 kernel_samsung_smdk4412-8a87a0b6313109d2fea87b1271d497c954ce2ca8.zip | |
Merge by hand (whitespace conflicts in libata.h)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/net/gianfar.c')
| -rw-r--r-- | drivers/net/gianfar.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 962580f2c4a..54d294ad6df 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c @@ -90,7 +90,6 @@ #include <asm/irq.h> #include <asm/uaccess.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/dma-mapping.h> #include <linux/crc32.h> #include <linux/mii.h> |