summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@eecs.umich.edu>2007-05-26 17:10:35 -0700
committerSteve Reinhardt <stever@eecs.umich.edu>2007-05-26 17:10:35 -0700
commit87bb4c3792d080e0be0b16b0b39957215c7dfbfa (patch)
tree610381930af6bedda57cea3662563965c9c4cc63 /src
parentda46364b1878339841e9cda5a62ee104409b6535 (diff)
parent44ebb8d3e27329e9f0b501897585359b4ab696f2 (diff)
downloadgem5-87bb4c3792d080e0be0b16b0b39957215c7dfbfa.tar.xz
Merge vm1.(none):/home/stever/bk/newmem-head
into vm1.(none):/home/stever/bk/newmem-cache2 --HG-- extra : convert_revision : c2540bfd34eb5a6f41cb15ffe50f8ec72f80abb1
Diffstat (limited to 'src')
-rwxr-xr-xsrc/arch/isa_parser.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/arch/isa_parser.py b/src/arch/isa_parser.py
index 4c8d0706d..6c8201f77 100755
--- a/src/arch/isa_parser.py
+++ b/src/arch/isa_parser.py
@@ -40,8 +40,8 @@ from types import *
# of 'build' in the current tree.
sys.path[0:0] = [os.environ['M5_PLY']]
-import lex
-import yacc
+from ply import lex
+from ply import yacc
#####################################################################
#