diff options
| author | Doug Chapman <doug.chapman@hp.com> | 2008-03-13 17:40:34 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2008-03-13 17:40:34 -0400 |
| commit | f7abe05b3306ed9a6f2cf5e3e45ed524d725d029 (patch) | |
| tree | 71866395380132f9912ff64762b883385404d384 /hw/xfree86/os-support/bus | |
| parent | 5d7437c29e686a081b20823450d78c4c2f4e0aec (diff) | |
Bug #14091: Fix build (and runtime) on ia64.
Diffstat (limited to 'hw/xfree86/os-support/bus')
| -rw-r--r-- | hw/xfree86/os-support/bus/Makefile.am | 12 | ||||
| -rw-r--r-- | hw/xfree86/os-support/bus/Pci.h | 3 |
2 files changed, 1 insertions, 14 deletions
diff --git a/hw/xfree86/os-support/bus/Makefile.am b/hw/xfree86/os-support/bus/Makefile.am index 381b9923c..5a15430c1 100644 --- a/hw/xfree86/os-support/bus/Makefile.am +++ b/hw/xfree86/os-support/bus/Makefile.am @@ -27,18 +27,6 @@ if LINUX_ALPHA PCI_SOURCES += axpPci.c endif -if LINUX_IA64 -PLATFORM_PCI_SOURCES = \ - 460gxPCI.c \ - 460gxPCI.h \ - altixPCI.c \ - altixPCI.h \ - e8870PCI.c \ - e8870PCI.h \ - zx1PCI.c \ - zx1PCI.h -endif - if XORG_BUS_SPARC PLATFORM_SOURCES = Sbus.c sdk_HEADERS += xf86Sbus.h diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h index 0abb34f98..ebac0905b 100644 --- a/hw/xfree86/os-support/bus/Pci.h +++ b/hw/xfree86/os-support/bus/Pci.h @@ -207,9 +207,8 @@ # endif #elif defined(__ia64__) # if defined(linux) -# define ARCH_PCI_INIT ia64linuxPciInit +# define ARCH_PCI_INIT linuxPciInit # endif -# define XF86SCANPCI_WRAPPER ia64ScanPCIWrapper #elif defined(__i386__) || defined(__i386) # if defined(linux) # define ARCH_PCI_INIT linuxPciInit |