diff options
author | Kevin Lim <ktlim@umich.edu> | 2005-01-18 15:48:38 -0500 |
---|---|---|
committer | Kevin Lim <ktlim@umich.edu> | 2005-01-18 15:48:38 -0500 |
commit | c389c2e327cc3ee1c988855b05505660c6670172 (patch) | |
tree | 7861dcb3ed07f03850ee922db9c0c33b038265e4 /dev/baddev.hh | |
parent | 42f3b4ffb3fedcb70e9ff068ed7160dc6020b8c4 (diff) | |
parent | 25f54857c9356b7f8608be8d45fec17d6c26bce5 (diff) | |
download | gem5-c389c2e327cc3ee1c988855b05505660c6670172.tar.xz |
Merge zizzer.eecs.umich.edu:/bk/m5/
into zamp.eecs.umich.edu:/z/ktlim2/m5
--HG--
extra : convert_revision : c8b7f46e9d0dbff2a12a7375d361098fba352647
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__ |