summaryrefslogtreecommitdiff
path: root/src/arch/x86/bios
diff options
context:
space:
mode:
authorNathan Binkert <nate@binkert.org>2009-05-17 14:34:52 -0700
committerNathan Binkert <nate@binkert.org>2009-05-17 14:34:52 -0700
commit8d2e51c7f52670055ffe97e221302561b87015a2 (patch)
tree792d211d603bd9155dee00861d1ce92d3ba2f09d /src/arch/x86/bios
parent709d859530325f28b904001f5a55dbdec2bad199 (diff)
downloadgem5-8d2e51c7f52670055ffe97e221302561b87015a2.tar.xz
includes: sort includes again
Diffstat (limited to 'src/arch/x86/bios')
-rw-r--r--src/arch/x86/bios/acpi.hh6
-rw-r--r--src/arch/x86/bios/e820.hh6
-rw-r--r--src/arch/x86/bios/intelmp.cc2
-rw-r--r--src/arch/x86/bios/smbios.cc2
-rw-r--r--src/arch/x86/bios/smbios.hh2
5 files changed, 9 insertions, 9 deletions
diff --git a/src/arch/x86/bios/acpi.hh b/src/arch/x86/bios/acpi.hh
index bcc4e1962..5bbabfcf7 100644
--- a/src/arch/x86/bios/acpi.hh
+++ b/src/arch/x86/bios/acpi.hh
@@ -58,12 +58,12 @@
#ifndef __ARCH_X86_BIOS_ACPI_HH__
#define __ARCH_X86_BIOS_ACPI_HH__
+#include <string>
+#include <vector>
+
#include "base/types.hh"
#include "sim/sim_object.hh"
-#include <vector>
-#include <string>
-
class Port;
class X86ACPIRSDPParams;
diff --git a/src/arch/x86/bios/e820.hh b/src/arch/x86/bios/e820.hh
index 0cff6cc16..184dd2072 100644
--- a/src/arch/x86/bios/e820.hh
+++ b/src/arch/x86/bios/e820.hh
@@ -58,13 +58,13 @@
#ifndef __ARCH_X86_BIOS_E820_HH__
#define __ARCH_X86_BIOS_E820_HH__
+#include <vector>
+
+#include "base/types.hh"
#include "params/X86E820Entry.hh"
#include "params/X86E820Table.hh"
-#include "base/types.hh"
#include "sim/sim_object.hh"
-#include <vector>
-
class Port;
namespace X86ISA
diff --git a/src/arch/x86/bios/intelmp.cc b/src/arch/x86/bios/intelmp.cc
index e526f9658..ab4f54bac 100644
--- a/src/arch/x86/bios/intelmp.cc
+++ b/src/arch/x86/bios/intelmp.cc
@@ -58,9 +58,9 @@
#include "arch/x86/bios/intelmp.hh"
#include "arch/x86/isa_traits.hh"
#include "base/misc.hh"
+#include "base/types.hh"
#include "mem/port.hh"
#include "sim/byteswap.hh"
-#include "base/types.hh"
// Config entry types
#include "params/X86IntelMPBaseConfigEntry.hh"
diff --git a/src/arch/x86/bios/smbios.cc b/src/arch/x86/bios/smbios.cc
index 1e49a875a..23ac55a6b 100644
--- a/src/arch/x86/bios/smbios.cc
+++ b/src/arch/x86/bios/smbios.cc
@@ -87,12 +87,12 @@
#include "arch/x86/bios/smbios.hh"
#include "arch/x86/isa_traits.hh"
+#include "base/types.hh"
#include "mem/port.hh"
#include "params/X86SMBiosBiosInformation.hh"
#include "params/X86SMBiosSMBiosStructure.hh"
#include "params/X86SMBiosSMBiosTable.hh"
#include "sim/byteswap.hh"
-#include "base/types.hh"
using namespace std;
diff --git a/src/arch/x86/bios/smbios.hh b/src/arch/x86/bios/smbios.hh
index 688b0a6c5..d1c537651 100644
--- a/src/arch/x86/bios/smbios.hh
+++ b/src/arch/x86/bios/smbios.hh
@@ -91,9 +91,9 @@
#include <string>
#include <vector>
+#include "base/types.hh"
#include "enums/Characteristic.hh"
#include "enums/ExtCharacteristic.hh"
-#include "base/types.hh"
#include "sim/sim_object.hh"
class FunctionalPort;