Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5

[gem5.git] / dev / simple_disk.cc

diff --git a/dev/simple_disk.cc b/dev/simple_disk.cc
index 25645db5f46efa07c928b258224230a0d802e5fc..19e8683dfd232f5d44e6548680add78cf879afe9 100644 (file)
--- a/dev/simple_disk.cc
+++ b/dev/simple_disk.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2001-2003 The Regents of The University of Michigan
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,19 +30,20 @@
  * Simple disk interface for the system console
  */
 
-#include <string>
-
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <fcntl.h>
-#include <string.h>
 #include <unistd.h>
 
-#include "disk_image.hh"
-#include "misc.hh"
-#include "physical_memory.hh"
-#include "simple_disk.hh"
-#include "trace.hh"
+#include <cstring>
+#include <string>
+
+#include "base/misc.hh"
+#include "base/trace.hh"
+#include "dev/disk_image.hh"
+#include "dev/simple_disk.hh"
+#include "mem/functional_mem/physical_memory.hh"
+#include "sim/builder.hh"
 
 using namespace std;