Merge with main repository.

[gem5.git] / src / dev / x86 / i8042.hh

diff --git a/src/dev/x86/i8042.hh b/src/dev/x86/i8042.hh
index b14d254ca8e571b5f4796c520a128004074a24e7..61220b45d703852a17062a80bba56a5b4bd7fe96 100644 (file)
--- a/src/dev/x86/i8042.hh
+++ b/src/dev/x86/i8042.hh
@@ -31,12 +31,12 @@
 #ifndef __DEV_X86_I8042_HH__
 #define __DEV_X86_I8042_HH__
 
-#include "dev/io_device.hh"
+#include <queue>
+
 #include "dev/x86/intdev.hh"
+#include "dev/io_device.hh"
 #include "params/I8042.hh"
 
-#include <queue>
-
 namespace X86ISA
 {
 
@@ -255,7 +255,7 @@ class I8042 : public BasicPioDevice
         commandByte.keyboardFullInt = 1;
     }
 
-    void addressRanges(AddrRangeList &range_list);
+    AddrRangeList getAddrRanges();
 
     Tick read(PacketPtr pkt);