diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2006-05-15 17:52:50 -0400 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-05-15 17:52:50 -0400 |
| commit | 7d3eb0fe801add2bdbb05b482e7d7d303b6f386d (patch) | |
| tree | ac86cd9f65d444b423655cd435ccc4dad808340c /arch/mips | |
| parent | 0a053c7919cb13d216d85784577cbbd4539cd291 (diff) | |
| parent | a6266a99e26a23d3a2f52e05f3742984629c3786 (diff) | |
| download | gem5-7d3eb0fe801add2bdbb05b482e7d7d303b6f386d.tar.xz | |
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem
base/loader/elf_object.cc:
removed SPARC32PLUS since it doesn't work.
--HG--
extra : convert_revision : 620a1c75cdeefbeeb97383d92335cf319d9c9444
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/linux/linux.hh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/linux/linux.hh b/arch/mips/linux/linux.hh index fd08e8c87..8bcc3f309 100644 --- a/arch/mips/linux/linux.hh +++ b/arch/mips/linux/linux.hh @@ -26,8 +26,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __MIPS_MIPS_LINUX_HH -#define __MIPS_MIPS_LINUX_HH +#ifndef __ARCH_MIPS_LINUX_LINUX_HH__ +#define __ARCH_MIPS_LINUX_LINUX_HH__ #include "kern/linux/linux.hh" |