aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-18 06:50:29 -0400
committerIngo Molnar <mingo@elte.hu>2009-03-18 06:53:48 -0400
commit84be58d4601c86306cd939ebf58a9b90989883a4 (patch)
tree9be6be59b65a3693a358fe4cf25144811be38c17
parent95f3c4ebffb5f5dd6c06bf48a8e24c7247b5139c (diff)
dma-debug: fix dma_debug_add_bus() definition for !CONFIG_DMA_API_DEBUG
Impact: build fix Fix: arch/x86/kvm/x86.o: In function `dma_debug_add_bus': (.text+0x0): multiple definition of `dma_debug_add_bus' dma_debug_add_bus() should be a static inline function. Cc: Joerg Roedel <joerg.roedel@amd.com> LKML-Reference: <20090317120112.GP6159@amd.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--include/linux/dma-debug.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/dma-debug.h b/include/linux/dma-debug.h
index e851d23e91eb..28d53cb7b5a2 100644
--- a/include/linux/dma-debug.h
+++ b/include/linux/dma-debug.h
@@ -83,7 +83,7 @@ extern void debug_dma_dump_mappings(struct device *dev);
83 83
84#else /* CONFIG_DMA_API_DEBUG */ 84#else /* CONFIG_DMA_API_DEBUG */
85 85
86void dma_debug_add_bus(struct bus_type *bus) 86static inline void dma_debug_add_bus(struct bus_type *bus)
87{ 87{
88} 88}
89 89