]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
e1000e: minor re-order of #include files
authorBruce Allan <bruce.w.allan@intel.com>
Fri, 29 Jul 2011 05:52:51 +0000 (05:52 +0000)
committerJoe Jin <joe.jin@oracle.com>
Thu, 2 Feb 2012 13:19:04 +0000 (21:19 +0800)
The recent commit a6b7a407 when back-ported to the out-of-tree e1000e
driver caused a compilation error on older kernels which required a
re-ordering of the #include files.  This cosmetic patch syncs the two
drivers for easier maintainability.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit 9fb7a5f77b26dedfcfa4e3a36fe207f818662bee)

Signed-off-by: Joe Jin <joe.jin@oracle.com>
drivers/net/e1000e/ethtool.c
drivers/net/e1000e/netdev.c

index 0d317a03714bf829d71874b8e078292de2101f82..06d88f316dce4de827975cc5abdfbf4d2700eb41 100644 (file)
@@ -29,6 +29,7 @@
 /* ethtool support for e1000 */
 
 #include <linux/netdevice.h>
+#include <linux/interrupt.h>
 #include <linux/ethtool.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
index a3417b7f65a424fe9cf8037a9af08b87bebeed44..ab4be80f7ab53bd01a28dd911a0dbabd26c27235 100644 (file)
@@ -36,6 +36,7 @@
 #include <linux/pagemap.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
+#include <linux/interrupt.h>
 #include <linux/tcp.h>
 #include <linux/ipv6.h>
 #include <linux/slab.h>