49,50c49,50
< #ifndef __DEV_ARM_AMBA_DEVICE_H__
< #define __DEV_ARM_AMBA_DEVICE_H__
---
> #ifndef __DEV_ARM_AMBA_DEVICE_HH__
> #define __DEV_ARM_AMBA_DEVICE_HH__
52a53,54
> #include "dev/io_device.hh"
> #include "dev/arm/gic.hh"
55d56
< #include "dev/io_device.hh"
86a88,92
> Addr pioAddr;
> Addr pioSize;
> Tick pioDelay;
> int intNum;
> Gic *gic;
94c100
< #endif //__DEV_ARM_AMBA_DEVICE_H__
---
> #endif //__DEV_ARM_AMBA_DEVICE_HH__