diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2007-01-27 01:59:20 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2007-01-27 01:59:20 -0500 |
| commit | 0358ccee23072eef0b6448e3170457037682a452 (patch) | |
| tree | 378b5ba325d74536092a7f245423d81274db38b4 /src/dev/ide_atareg.h | |
| parent | e41f54f97f9ebdea32cc6498c346636cddc9e06d (diff) | |
| parent | 5c7bf74c073d0aea808046d10dfcaa6c319217a3 (diff) | |
| download | gem5-0358ccee23072eef0b6448e3170457037682a452.tar.xz | |
Merge zizzer:/bk/newmem
into zower.eecs.umich.edu:/eecshome/m5/newmem
src/arch/sparc/isa/formats/mem/util.isa:
src/arch/sparc/isa_traits.hh:
src/arch/sparc/system.cc:
Hand Merge
--HG--
extra : convert_revision : d5e0c97caebb616493e2f642e915969d7028109c
Diffstat (limited to 'src/dev/ide_atareg.h')
| -rw-r--r-- | src/dev/ide_atareg.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dev/ide_atareg.h b/src/dev/ide_atareg.h index df16d09d5..b9f1d9e0f 100644 --- a/src/dev/ide_atareg.h +++ b/src/dev/ide_atareg.h @@ -35,7 +35,7 @@ #if defined(linux) #include <endian.h> -#elif defined(__sun__) +#elif defined(__sun) #include <sys/isa_defs.h> #else #include <machine/endian.h> |