2c2
< * Copyright (c) 2012-2013,2015 ARM Limited
---
> * Copyright (c) 2012-2013, 2015, 2018 ARM Limited
61c61
< private:
---
> protected:
105a106,107
> virtual Tick sendPacket(MasterPort &port, const PacketPtr &pkt);
>
140d141
<
161c162
< bool fastmem;
---
>