diff options
| author | Anton Vorontsov <cbouatmailru@gmail.com> | 2010-04-26 13:56:19 -0400 |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2010-04-26 13:56:19 -0400 |
| commit | 8ef1bb539203629f77a61976e4f25415e1083bff (patch) | |
| tree | 4fee25aca0928f112716fb02d27b1b355d0843b4 /drivers/net/vxge/vxge-ethtool.c | |
| parent | a3bcbbee83f55cbaec9b2ad748e7300c7feb2192 (diff) | |
| parent | b91ce4d14a21fc04d165be30319541e0f9204f15 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/vxge/vxge-ethtool.c')
| -rw-r--r-- | drivers/net/vxge/vxge-ethtool.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/vxge/vxge-ethtool.c b/drivers/net/vxge/vxge-ethtool.c index c6736b972635..aaf374cfd322 100644 --- a/drivers/net/vxge/vxge-ethtool.c +++ b/drivers/net/vxge/vxge-ethtool.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | * Copyright(c) 2002-2009 Neterion Inc. | 12 | * Copyright(c) 2002-2009 Neterion Inc. |
| 13 | ******************************************************************************/ | 13 | ******************************************************************************/ |
| 14 | #include<linux/ethtool.h> | 14 | #include<linux/ethtool.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | #include <linux/pci.h> | 16 | #include <linux/pci.h> |
| 16 | #include <linux/etherdevice.h> | 17 | #include <linux/etherdevice.h> |
| 17 | 18 | ||