diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-06-12 00:49:24 -0400 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-06-12 00:49:24 -0400 |
| commit | 15a8f050605919579e81b6abb98a0b596334216d (patch) | |
| tree | 583b0b30f13d9874a69015d58d041ce2d7352960 /src/python/m5/objects/Pci.py | |
| parent | 60a734e1750f3c051fe92fea6f12158db6e2dcb9 (diff) | |
| parent | df4b4f001e4db902297acf3b75480e4886e4e882 (diff) | |
| download | gem5-15a8f050605919579e81b6abb98a0b596334216d.tar.xz | |
Merge m5.eecs.umich.edu:/bk/newmem
into ewok.(none):/home/gblack/m5/newmem
src/arch/sparc/regfile.hh:
Hand Merge
--HG--
extra : convert_revision : c47202689202069892524a7d71962082469996ee
Diffstat (limited to 'src/python/m5/objects/Pci.py')
| -rw-r--r-- | src/python/m5/objects/Pci.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/python/m5/objects/Pci.py b/src/python/m5/objects/Pci.py index 85cefcd44..9e1e91b13 100644 --- a/src/python/m5/objects/Pci.py +++ b/src/python/m5/objects/Pci.py @@ -1,4 +1,4 @@ -from m5 import * +from m5.config import * from Device import BasicPioDevice, DmaDevice class PciConfigData(SimObject): |