diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-11-19 14:48:07 +0000 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-11-19 14:48:07 +0000 |
| commit | dba0a918722ee0f0ba3442575e4448c3ab622be4 (patch) | |
| tree | fdb466cf09e7916135098d651b18924b2fe9ba5f /drivers/net/atl1e/atl1e.h | |
| parent | 0996e6382482ce9014787693d3884e9468153a5c (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
| download | linux-dba0a918722ee0f0ba3442575e4448c3ab622be4.tar.gz linux-dba0a918722ee0f0ba3442575e4448c3ab622be4.tar.bz2 linux-dba0a918722ee0f0ba3442575e4448c3ab622be4.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'drivers/net/atl1e/atl1e.h')
| -rw-r--r-- | drivers/net/atl1e/atl1e.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/atl1e/atl1e.h b/drivers/net/atl1e/atl1e.h index b645fa0f3f64..c49550d507a0 100644 --- a/drivers/net/atl1e/atl1e.h +++ b/drivers/net/atl1e/atl1e.h @@ -46,7 +46,6 @@ #include <linux/vmalloc.h> #include <linux/pagemap.h> #include <linux/tcp.h> -#include <linux/mii.h> #include <linux/ethtool.h> #include <linux/if_vlan.h> #include <linux/workqueue.h> |