summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-18 11:50:29 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-18 11:53:48 +0100
commit84be58d4601c86306cd939ebf58a9b90989883a4 (patch)
tree9be6be59b65a3693a358fe4cf25144811be38c17 /include/linux
parent95f3c4ebffb5f5dd6c06bf48a8e24c7247b5139c (diff)
downloadop-kernel-dev-84be58d4601c86306cd939ebf58a9b90989883a4.zip
op-kernel-dev-84be58d4601c86306cd939ebf58a9b90989883a4.tar.gz
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>
Diffstat (limited to 'include/linux')
-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 e851d23..28d53cb 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);
#else /* CONFIG_DMA_API_DEBUG */
-void dma_debug_add_bus(struct bus_type *bus)
+static inline void dma_debug_add_bus(struct bus_type *bus)
{
}
OpenPOWER on IntegriCloud