[PATCH 03/11] xfree86: bus: move IOADDRESS definition to a common header file

[Tiago Vignatti]

IOADDRESS type definition encompass more than just pci code, so move it to
common.

Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
---
 hw/xfree86/common/xf86str.h         |    1 +
 hw/xfree86/os-support/bus/xf86Pci.h |    3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
index de1f1b6..485c15a 100644
--- a/hw/xfree86/common/xf86str.h
+++ b/hw/xfree86/common/xf86str.h
@@ -58,6 +58,7 @@ typedef uint64_t memType;
 typedef uintptr_t memType;
 #endif
 
+typedef unsigned long IOADDRESS;    /* Must be large enough for a pointer */
 
 /* Video mode flags */
 
diff --git a/hw/xfree86/os-support/bus/xf86Pci.h b/hw/xfree86/os-support/bus/xf86Pci.h
index ce1336b..a9a2779 100644
--- a/hw/xfree86/os-support/bus/xf86Pci.h
+++ b/hw/xfree86/os-support/bus/xf86Pci.h
@@ -235,7 +235,6 @@
 
 /* Primitive Types */
 typedef unsigned long ADDRESS;		/* Memory/PCI address */
-typedef unsigned long IOADDRESS;	/* Must be large enough for a pointer */
 typedef unsigned long PCITAG;
 
 typedef enum {
@@ -257,6 +256,6 @@ extern _X_EXPORT Bool xf86scanpci(void);
 /* Domain access functions.  Some of these probably shouldn't be public */
 extern _X_EXPORT pointer xf86MapDomainMemory(int ScreenNum, int Flags, struct pci_device *dev,
     ADDRESS Base, unsigned long Size);
-extern _X_EXPORT IOADDRESS xf86MapLegacyIO(struct pci_device *dev);
+extern _X_EXPORT unsigned long xf86MapLegacyIO(struct pci_device *dev);
 
 #endif /* _XF86PCI_H */
-- 
1.6.0.4