diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2010-04-23 02:08:44 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-04-23 02:08:44 +0200 |
| commit | 6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1 (patch) | |
| tree | 797676a336b050bfa1ef879377c07e541b9075d6 /drivers/net/qlge/qlge_ethtool.c | |
| parent | UML: Fix compiler warning due to missing task_struct declaration (diff) | |
| parent | Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 (diff) | |
| download | linux-dev-6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1.tar.xz linux-dev-6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1.zip | |
Merge branch 'master' into for-next
Diffstat (limited to 'drivers/net/qlge/qlge_ethtool.c')
| -rw-r--r-- | drivers/net/qlge/qlge_ethtool.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/qlge/qlge_ethtool.c b/drivers/net/qlge/qlge_ethtool.c index 7dbff87480dc..7e09ff4a5755 100644 --- a/drivers/net/qlge/qlge_ethtool.c +++ b/drivers/net/qlge/qlge_ethtool.c @@ -7,7 +7,6 @@ #include <linux/dma-mapping.h> #include <linux/pagemap.h> #include <linux/sched.h> -#include <linux/slab.h> #include <linux/dmapool.h> #include <linux/mempool.h> #include <linux/spinlock.h> |