From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Wed, 1 Nov 2006 16:47:47 +0000 (-0800)
Subject: e1000: reorder pci-e infor struct
X-Git-Tag: v2.6.20-rc2~6^2~13^2~468^2~83
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2bc35c1078fdfe7bb2a849c2d1bee8d9d5fea4a7;p=linux-2.6-omap-h63xx.git

e1000: reorder pci-e infor struct

Order pci-e capability struct according to bus/pci bus width ordering
preserving the hard pci spec numbers.

Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---

diff --git a/drivers/net/e1000/e1000_hw.h b/drivers/net/e1000/e1000_hw.h
index 31bea321584..f247f264a57 100644
--- a/drivers/net/e1000/e1000_hw.h
+++ b/drivers/net/e1000/e1000_hw.h
@@ -128,11 +128,13 @@ typedef enum {
 /* PCI bus widths */
 typedef enum {
     e1000_bus_width_unknown = 0,
+    /* These PCIe values should literally match the possible return values
+     * from config space */
+    e1000_bus_width_pciex_1 = 1,
+    e1000_bus_width_pciex_2 = 2,
+    e1000_bus_width_pciex_4 = 4,
     e1000_bus_width_32,
     e1000_bus_width_64,
-    e1000_bus_width_pciex_1,
-    e1000_bus_width_pciex_2,
-    e1000_bus_width_pciex_4,
     e1000_bus_width_reserved
 } e1000_bus_width;