diff options
author | Ali Saidi <saidi@eecs.umich.edu> | 2006-10-20 13:00:15 -0400 |
---|---|---|
committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-10-20 13:00:15 -0400 |
commit | 7be58fd5f4c3f9f112b19de3a81861bded21acb0 (patch) | |
tree | ad9ca8f688f1e57d9af1b900c712224b050fb462 /src/python/m5 | |
parent | a4c6f0d69eda5d23b12576080d532ddf768fbdbe (diff) | |
parent | 32384b2f6be42016f7bd92c9cfca591314f68e5e (diff) | |
download | gem5-7be58fd5f4c3f9f112b19de3a81861bded21acb0.tar.xz |
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem.head
--HG--
extra : convert_revision : c0f9bde20585b3811ff906728b003072b69696b5
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 |