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-sparc/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-sparc/pci.h')
-rw-r--r-- | include/asm-sparc/pci.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-sparc/pci.h b/include/asm-sparc/pci.h index 2fd65db95e92..44bb38758c96 100644 --- a/include/asm-sparc/pci.h +++ b/include/asm-sparc/pci.h | |||
@@ -144,6 +144,7 @@ extern inline int pci_dma_supported(struct pci_dev *hwdev, u64 mask) | |||
144 | 144 | ||
145 | #define pci_dac_dma_supported(dev, mask) (0) | 145 | #define pci_dac_dma_supported(dev, mask) (0) |
146 | 146 | ||
147 | #ifdef CONFIG_PCI | ||
147 | static inline void pci_dma_burst_advice(struct pci_dev *pdev, | 148 | static inline void pci_dma_burst_advice(struct pci_dev *pdev, |
148 | enum pci_dma_burst_strategy *strat, | 149 | enum pci_dma_burst_strategy *strat, |
149 | unsigned long *strategy_parameter) | 150 | unsigned long *strategy_parameter) |
@@ -151,6 +152,7 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev, | |||
151 | *strat = PCI_DMA_BURST_INFINITY; | 152 | *strat = PCI_DMA_BURST_INFINITY; |
152 | *strategy_parameter = ~0UL; | 153 | *strategy_parameter = ~0UL; |
153 | } | 154 | } |
155 | #endif | ||
154 | 156 | ||
155 | static inline void pcibios_add_platform_entries(struct pci_dev *dev) | 157 | static inline void pcibios_add_platform_entries(struct pci_dev *dev) |
156 | { | 158 | { |