From 6853823b1e5861cf0efba0b25d1a2259fe8954c2 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Fri, 26 Sep 2003 00:01:17 -0700 Subject: [PATCH] [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. --- arch/ia64/sn/io/machvec/pci.c | 8 -------- arch/ia64/sn/io/machvec/pci_dma.c | 4 ---- 2 files changed, 12 deletions(-) diff --git a/arch/ia64/sn/io/machvec/pci.c b/arch/ia64/sn/io/machvec/pci.c index f391222452ee6..5d1b590bfbc15 100644 --- 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 4aa463c507c6f..059b37c6394c0 100644 --- 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); -- 2.53.0