diff options
| author | Andrew Schultz <alschult@umich.edu> | 2004-05-25 16:36:20 -0400 |
|---|---|---|
| committer | Andrew Schultz <alschult@umich.edu> | 2004-05-25 16:36:20 -0400 |
| commit | f0d45c797c40b91b7021699f0aa202d06015a94e (patch) | |
| tree | 198bbccc1b28be519ac6715939a950b84c137655 /dev/tsunami.hh | |
| parent | ced021a78f28b4f44bb10233f4acd3a1cae81e2b (diff) | |
| parent | 391f228fdaba2d15875ffee5747637c0cd257c71 (diff) | |
| download | gem5-f0d45c797c40b91b7021699f0aa202d06015a94e.tar.xz | |
Merge zizzer:/bk/linux
into zower.eecs.umich.edu:/.automount/zizzer/z/alschult/DiskModel/linux
--HG--
extra : convert_revision : 67753db3defad3c44640df09a9465670f1667800
Diffstat (limited to 'dev/tsunami.hh')
| -rw-r--r-- | dev/tsunami.hh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dev/tsunami.hh b/dev/tsunami.hh index f619e4cff..476d7e18e 100644 --- a/dev/tsunami.hh +++ b/dev/tsunami.hh @@ -39,7 +39,7 @@ class IdeController; class TlaserClock; -class EtherDev; +class NSGigE; class TsunamiCChip; class TsunamiPChip; class TsunamiIO; @@ -67,7 +67,7 @@ class Tsunami : public Platform /** Pointer to the disk controller device */ IdeController *disk_controller; /** Pointer to the ethernet controller device */ - EtherDev *ethernet; + NSGigE *ethernet; /** Pointer to the Tsunami CChip. * The chip contains some configuration information and |