diff options
| author | Ron Dreslinski <rdreslin@umich.edu> | 2005-01-17 15:03:48 -0500 |
|---|---|---|
| committer | Ron Dreslinski <rdreslin@umich.edu> | 2005-01-17 15:03:48 -0500 |
| commit | ff9c4f109764e245f5bff5dffc9fec83224c9d4f (patch) | |
| tree | c6161e4de8773b0296e2b416195a562fd931a42b /dev/baddev.hh | |
| parent | 93146bc81a391fc298c2b49e2b3ecf969ae93b72 (diff) | |
| parent | c9fa82e25f2d86f2e26d357fac669c18899e39f8 (diff) | |
| download | gem5-ff9c4f109764e245f5bff5dffc9fec83224c9d4f.tar.xz | |
Merge zizzer:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/timing_L1
--HG--
extra : convert_revision : da464558edb2a77dc02033464a88a59f2ae6355d
Diffstat (limited to 'dev/baddev.hh')
| -rw-r--r-- | dev/baddev.hh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dev/baddev.hh b/dev/baddev.hh index 8680f6b0a..a9e904c62 100644 --- a/dev/baddev.hh +++ b/dev/baddev.hh @@ -31,8 +31,8 @@ * kernel that touches the frame buffer which isn't allowed. */ -#ifndef __BADDEV_HH__ -#define __BADDEV_HH__ +#ifndef __DEV_BADDEV_HH__ +#define __DEV_BADDEV_HH__ #include "base/range.hh" #include "dev/io_device.hh" @@ -90,4 +90,4 @@ class BadDevice : public PioDevice Tick cacheAccess(MemReqPtr &req); }; -#endif // __BADDEV_HH__ +#endif // __DEV_BADDEV_HH__ |