aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-ia64/pci.h
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2005-06-07 02:07:46 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2005-06-28 00:52:46 -0400
commitbb4a61b6eaee01707f24deeefc5d7136f25f75c5 (patch)
tree8d353d7b04addad950de8ae24eda7cdfe6fbea85 /include/asm-ia64/pci.h
parente24c2d963a604d9eaa560c90371fa387d3eec8f1 (diff)
[PATCH] PCI: fix up errors after dma bursting patch and CONFIG_PCI=n
With CONFIG_PCI=n: In file included from include/linux/pci.h:917, from lib/iomap.c:6: include/asm/pci.h:104: warning: `enum pci_dma_burst_strategy' declared inside parameter list include/asm/pci.h:104: warning: its scope is only this definition or declaration, which is probably not what you want. include/asm/pci.h: In function `pci_dma_burst_advice': include/asm/pci.h:106: dereferencing pointer to incomplete type include/asm/pci.h:106: `PCI_DMA_BURST_INFINITY' undeclared (first use in this function) include/asm/pci.h:106: (Each undeclared identifier is reported only once include/asm/pci.h:106: for each function it appears in.) make[1]: *** [lib/iomap.o] Error 1 Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/asm-ia64/pci.h')
-rw-r--r--include/asm-ia64/pci.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-ia64/pci.h b/include/asm-ia64/pci.h
index c9f1ab4e477d..0c4c5d801d3f 100644
--- a/include/asm-ia64/pci.h
+++ b/include/asm-ia64/pci.h
@@ -82,6 +82,7 @@ extern int pcibios_prep_mwi (struct pci_dev *);
82#define sg_dma_len(sg) ((sg)->dma_length) 82#define sg_dma_len(sg) ((sg)->dma_length)
83#define sg_dma_address(sg) ((sg)->dma_address) 83#define sg_dma_address(sg) ((sg)->dma_address)
84 84
85#ifdef CONFIG_PCI
85static inline void pci_dma_burst_advice(struct pci_dev *pdev, 86static inline void pci_dma_burst_advice(struct pci_dev *pdev,
86 enum pci_dma_burst_strategy *strat, 87 enum pci_dma_burst_strategy *strat,
87 unsigned long *strategy_parameter) 88 unsigned long *strategy_parameter)
@@ -98,6 +99,7 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev,
98 *strat = PCI_DMA_BURST_MULTIPLE; 99 *strat = PCI_DMA_BURST_MULTIPLE;
99 *strategy_parameter = cacheline_size; 100 *strategy_parameter = cacheline_size;
100} 101}
102#endif
101 103
102#define HAVE_PCI_MMAP 104#define HAVE_PCI_MMAP
103extern int pci_mmap_page_range (struct pci_dev *dev, struct vm_area_struct *vma, 105extern int pci_mmap_page_range (struct pci_dev *dev, struct vm_area_struct *vma,