diff options
| author | Kevin Lim <ktlim@umich.edu> | 2005-04-14 16:06:34 -0400 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2005-04-14 16:06:34 -0400 |
| commit | 26d6d97f5d46bfe2cc5734eb632bec0bc67aed19 (patch) | |
| tree | ed8a33f234ee4d85bc79f6179ea8907976ee3e70 /dev/ide_disk.hh | |
| parent | dcedd7866e35adc1e0fbc081188b259ffc7bbdf5 (diff) | |
| parent | 5e67b78af7f74d7223ced5b54978ca9fa29606c5 (diff) | |
| download | gem5-26d6d97f5d46bfe2cc5734eb632bec0bc67aed19.tar.xz | |
Merge ktlim@zizzer.eecs.umich.edu:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5
--HG--
extra : convert_revision : 0baadd8d68bfa6f8e96307eb2d4426b0d9e0b8b4
Diffstat (limited to 'dev/ide_disk.hh')
| -rw-r--r-- | dev/ide_disk.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dev/ide_disk.hh b/dev/ide_disk.hh index 9c6eea623..703625595 100644 --- a/dev/ide_disk.hh +++ b/dev/ide_disk.hh @@ -248,7 +248,7 @@ class IdeDisk : public SimObject * @param disk_delay The disk delay in milliseconds */ IdeDisk(const std::string &name, DiskImage *img, PhysicalMemory *phys, - int id, int disk_delay); + int id, Tick disk_delay); /** * Delete the data buffer. |