diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2006-10-24 12:59:19 -0400 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-10-24 12:59:19 -0400 |
| commit | 0f98905ecca68474769546a3bad5c346d952819d (patch) | |
| tree | e2b16148901df398f3274327d2578a3b6ee56298 /src/python/m5 | |
| parent | 06482e6eeda9ba092c2fdc87217e391e64ff36a0 (diff) | |
| parent | 650ebe4ec309e5bf4e5ae7acf6e928601c44e548 (diff) | |
| download | gem5-0f98905ecca68474769546a3bad5c346d952819d.tar.xz | |
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem.head
--HG--
extra : convert_revision : 4db140e6e8408b3ed39da327515b8e88a2701e6b
Diffstat (limited to 'src/python/m5')
| -rw-r--r-- | src/python/m5/objects/Ethernet.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/python/m5/objects/Ethernet.py b/src/python/m5/objects/Ethernet.py index f17a6c888..a52e35511 100644 --- 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 |