[PATCH] ia64: remove CONFIG_PCI ifdefs in SN2 code

It's not like it would compile without PCI support anyway, and these
ifdefs are _really_ strange.

diff --git a/arch/ia64/sn/io/machvec/pci.c b/arch/ia64/sn/io/machvec/pci.c
index f391222452ee61275bb3de0ec26622d49ae76c52..5d1b590bfbc15bb0864d089e154bd99e22472992 100644 (file)
--- a/arch/ia64/sn/io/machvec/pci.c
+++ b/arch/ia64/sn/io/machvec/pci.c
@@ -35,8 +35,6 @@
  * can probably be removed with a little more cleanup now that the SAL routines
  * work on sn2.
  */
-#ifdef CONFIG_PCI
-
 extern vertex_hdl_t devfn_to_vertex(unsigned char bus, unsigned char devfn);
 
 int sn_read_config(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 *val)
@@ -71,9 +69,3 @@ struct pci_ops sn_pci_ops = {
        .read = sn_read_config,
        .write = sn_write_config,
 };
-
-#else
-struct list_head pci_root_buses;
-struct list_head pci_root_buses;
-struct list_head pci_devices;
-#endif /* CONFIG_PCI */

diff --git a/arch/ia64/sn/io/machvec/pci_dma.c b/arch/ia64/sn/io/machvec/pci_dma.c
index 4aa463c507c6f586ed34db7d79ce9a0ba1d4dc7d..059b37c6394c0318c97f457a03cabadca6f150f2 100644 (file)
--- a/arch/ia64/sn/io/machvec/pci_dma.c
+++ b/arch/ia64/sn/io/machvec/pci_dma.c
@@ -562,8 +562,6 @@ sn_pci_dma_supported(struct pci_dev *hwdev, u64 mask)
        return 1;
 }
 
-#ifdef CONFIG_PCI
-
 /*
  * New generic DMA routines just wrap sn2 PCI routines until we
  * support other bus types (if ever).
@@ -692,8 +690,6 @@ sn_dma_sync_sg(struct device *dev, struct scatterlist *sg, int nelems,
 }
 EXPORT_SYMBOL(sn_dma_sync_sg);
 
-#endif /* CONFIG_PCI */
-
 EXPORT_SYMBOL(sn_pci_unmap_single);
 EXPORT_SYMBOL(sn_pci_map_single);
 EXPORT_SYMBOL(sn_pci_dma_sync_single);