Merge zizzer:/bk/newmem

into zeep.pool:/z/saidi/work/m5.newmem.head --HG-- extra : convert_revision : 4db140e6e8408b3ed39da327515b8e88a2701e6b
2006-10-24 12:59:19 -04:00
parent 06482e6eed 650ebe4ec3
commit 0f98905ecc
5 changed files with 388 additions and 11 deletions
--- a/src/python/m5/objects/Ethernet.py
+++ b/src/python/m5/objects/Ethernet.py
@@ -71,7 +71,7 @@ class IGbE(PciDevice):

 class IGbEPciData(PciConfigData):
    VendorID = 0x8086
-    DeviceID = 0x1026
+    DeviceID = 0x1075
    SubsystemID = 0x1008
    SubsystemVendorID = 0x8086
    Status = 0x0000