Commit 6853823b authored by Christoph Hellwig's avatar Christoph Hellwig

[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.
parent d1409597
...@@ -35,8 +35,6 @@ ...@@ -35,8 +35,6 @@
* can probably be removed with a little more cleanup now that the SAL routines * can probably be removed with a little more cleanup now that the SAL routines
* work on sn2. * work on sn2.
*/ */
#ifdef CONFIG_PCI
extern vertex_hdl_t devfn_to_vertex(unsigned char bus, unsigned char devfn); 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) 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 = { ...@@ -71,9 +69,3 @@ struct pci_ops sn_pci_ops = {
.read = sn_read_config, .read = sn_read_config,
.write = sn_write_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 */
...@@ -562,8 +562,6 @@ sn_pci_dma_supported(struct pci_dev *hwdev, u64 mask) ...@@ -562,8 +562,6 @@ sn_pci_dma_supported(struct pci_dev *hwdev, u64 mask)
return 1; return 1;
} }
#ifdef CONFIG_PCI
/* /*
* New generic DMA routines just wrap sn2 PCI routines until we * New generic DMA routines just wrap sn2 PCI routines until we
* support other bus types (if ever). * support other bus types (if ever).
...@@ -692,8 +690,6 @@ sn_dma_sync_sg(struct device *dev, struct scatterlist *sg, int nelems, ...@@ -692,8 +690,6 @@ sn_dma_sync_sg(struct device *dev, struct scatterlist *sg, int nelems,
} }
EXPORT_SYMBOL(sn_dma_sync_sg); EXPORT_SYMBOL(sn_dma_sync_sg);
#endif /* CONFIG_PCI */
EXPORT_SYMBOL(sn_pci_unmap_single); EXPORT_SYMBOL(sn_pci_unmap_single);
EXPORT_SYMBOL(sn_pci_map_single); EXPORT_SYMBOL(sn_pci_map_single);
EXPORT_SYMBOL(sn_pci_dma_sync_single); EXPORT_SYMBOL(sn_pci_dma_sync_single);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment