diff options
author | Andrew Morton <akpm@osdl.org> | 2005-06-07 02:07:46 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-06-28 00:52:46 -0400 |
commit | bb4a61b6eaee01707f24deeefc5d7136f25f75c5 (patch) | |
tree | 8d353d7b04addad950de8ae24eda7cdfe6fbea85 /include/asm-parisc/pci.h | |
parent | e24c2d963a604d9eaa560c90371fa387d3eec8f1 (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-parisc/pci.h')
-rw-r--r-- | include/asm-parisc/pci.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-parisc/pci.h b/include/asm-parisc/pci.h index f9f5bf90111d..ee741c150176 100644 --- a/include/asm-parisc/pci.h +++ b/include/asm-parisc/pci.h | |||
@@ -230,6 +230,7 @@ extern inline void pcibios_register_hba(struct pci_hba_data *x) | |||
230 | /* export the pci_ DMA API in terms of the dma_ one */ | 230 | /* export the pci_ DMA API in terms of the dma_ one */ |
231 | #include <asm-generic/pci-dma-compat.h> | 231 | #include <asm-generic/pci-dma-compat.h> |
232 | 232 | ||
233 | #ifdef CONFIG_PCI | ||
233 | static inline void pci_dma_burst_advice(struct pci_dev *pdev, | 234 | static inline void pci_dma_burst_advice(struct pci_dev *pdev, |
234 | enum pci_dma_burst_strategy *strat, | 235 | enum pci_dma_burst_strategy *strat, |
235 | unsigned long *strategy_parameter) | 236 | unsigned long *strategy_parameter) |
@@ -246,6 +247,7 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev, | |||
246 | *strat = PCI_DMA_BURST_MULTIPLE; | 247 | *strat = PCI_DMA_BURST_MULTIPLE; |
247 | *strategy_parameter = cacheline_size; | 248 | *strategy_parameter = cacheline_size; |
248 | } | 249 | } |
250 | #endif | ||
249 | 251 | ||
250 | extern void | 252 | extern void |
251 | pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region, | 253 | pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region, |