projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue
[linux-block.git]
/
drivers
/
net
/
ethernet
/
intel
/
igc
/
igc_main.c
diff --git
a/drivers/net/ethernet/intel/igc/igc_main.c
b/drivers/net/ethernet/intel/igc/igc_main.c
index 2c40796c151fb66c41f484531d0a0135de510903..0a1570129e5bb4096d978591a6b37f79a634256c 100644
(file)
--- a/
drivers/net/ethernet/intel/igc/igc_main.c
+++ b/
drivers/net/ethernet/intel/igc/igc_main.c
@@
-4,7
+4,6
@@
#include <linux/module.h>
#include <linux/types.h>
#include <linux/if_vlan.h>
-#include <linux/aer.h>
#include <linux/tcp.h>
#include <linux/udp.h>
#include <linux/ip.h>