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-x86_64 | |
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-x86_64')
-rw-r--r-- | include/asm-x86_64/pci.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-x86_64/pci.h b/include/asm-x86_64/pci.h index 8461d6af102e..c1961db88fac 100644 --- a/include/asm-x86_64/pci.h +++ b/include/asm-x86_64/pci.h | |||
@@ -123,6 +123,7 @@ pci_dac_dma_sync_single_for_device(struct pci_dev *pdev, dma64_addr_t dma_addr, | |||
123 | flush_write_buffers(); | 123 | flush_write_buffers(); |
124 | } | 124 | } |
125 | 125 | ||
126 | #ifdef CONFIG_PCI | ||
126 | static inline void pci_dma_burst_advice(struct pci_dev *pdev, | 127 | static inline void pci_dma_burst_advice(struct pci_dev *pdev, |
127 | enum pci_dma_burst_strategy *strat, | 128 | enum pci_dma_burst_strategy *strat, |
128 | unsigned long *strategy_parameter) | 129 | unsigned long *strategy_parameter) |
@@ -130,6 +131,7 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev, | |||
130 | *strat = PCI_DMA_BURST_INFINITY; | 131 | *strat = PCI_DMA_BURST_INFINITY; |
131 | *strategy_parameter = ~0UL; | 132 | *strategy_parameter = ~0UL; |
132 | } | 133 | } |
134 | #endif | ||
133 | 135 | ||
134 | #define HAVE_PCI_MMAP | 136 | #define HAVE_PCI_MMAP |
135 | extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, | 137 | extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, |