diff options
Diffstat (limited to 'dev/alpha_console.cc')
| -rw-r--r-- | dev/alpha_console.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/dev/alpha_console.cc b/dev/alpha_console.cc index f592b239d..2e9e09e93 100644 --- a/dev/alpha_console.cc +++ b/dev/alpha_console.cc @@ -58,7 +58,6 @@ AlphaConsole::AlphaConsole(const string &name, SimConsole *cons, SimpleDisk *d, int num_cpus, MemoryController *mmu, Addr a, HierParams *hier, Bus *bus) : PioDevice(name), disk(d), console(cons), addr(a) ->>>>>>> { mmu->add_child(this, Range<Addr>(addr, addr + size)); |