diff options
| author | Andrew Schultz <alschult@umich.edu> | 2004-06-04 15:13:04 -0400 |
|---|---|---|
| committer | Andrew Schultz <alschult@umich.edu> | 2004-06-04 15:13:04 -0400 |
| commit | 0379a27896bf43bfbc2e6f7f6921f22bd41a3209 (patch) | |
| tree | 1ecf71e5c4b6dd531c094daa9c372de92ac3f5a2 /dev/ns_gige.hh | |
| parent | df45c7b404edf00ec76da655dd5b7c77ea21fc62 (diff) | |
| parent | d270ea851a92e98d3efe30774f31f935d846dcd3 (diff) | |
| download | gem5-0379a27896bf43bfbc2e6f7f6921f22bd41a3209.tar.xz | |
Merge zizzer:/bk/linux
into zower.eecs.umich.edu:/z/alschult/DiskModel/linux
--HG--
extra : convert_revision : b23a1d1a79ac5c593150d269d0523c474cf6a4a0
Diffstat (limited to 'dev/ns_gige.hh')
| -rw-r--r-- | dev/ns_gige.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dev/ns_gige.hh b/dev/ns_gige.hh index d2f234bca..9466e8930 100644 --- a/dev/ns_gige.hh +++ b/dev/ns_gige.hh @@ -345,7 +345,7 @@ class NSGigE : public PciDev bool dma_data_free, Tick dma_read_delay, Tick dma_write_delay, Tick dma_read_factor, Tick dma_write_factor, PciConfigAll *cf, PciConfigData *cd, Tsunami *t, uint32_t bus, uint32_t dev, - uint32_t func, bool rx_filter, const int eaddr[6], Addr addr); + uint32_t func, bool rx_filter, const int eaddr[6]); ~NSGigE(); virtual void WriteConfig(int offset, int size, uint32_t data); |