diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-14 10:00:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-14 10:00:42 -0700 |
| commit | 3e862dd5c94cc53ba6494804c7388303e3d25403 (patch) | |
| tree | 16cec9fb546f7eb9233a6f7dd7c8be4a300503e3 /arch/sh/drivers/pci/pci.c | |
| parent | 2344b5b6851466511663154e517f8b31f70c4bb6 (diff) | |
| parent | e588a00fe546695e93077b3f7b7009f0c31d9370 (diff) | |
| download | kernel_samsung_smdk4412-3e862dd5c94cc53ba6494804c7388303e3d25403.tar.gz kernel_samsung_smdk4412-3e862dd5c94cc53ba6494804c7388303e3d25403.tar.bz2 kernel_samsung_smdk4412-3e862dd5c94cc53ba6494804c7388303e3d25403.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Add in PCI bus for DMA API debugging.
sh: Pre-allocate a reasonable number of DMA debug entries.
sh: sh7786: modify usb setup timeout judgment bug.
MAINTAINERS: Update sh architecture file patterns.
sh: ap325: use edge control for ov772x camera
sh: Plug in support for ARCH=sh64 using sh SRCARCH.
sh: urquell: Fix up address mapping in board comments.
sh: Add support for DMA API debugging.
sh: Provide cpumask_of_pcibus() to fix NUMA build.
sh: urquell: Add board comment
sh: wire up sys_preadv/sys_pwritev() syscalls.
sh: sh7785lcr: fix PCI address map for 32-bit mode
sh: intc: Added resume from hibernation support to the intc
Diffstat (limited to 'arch/sh/drivers/pci/pci.c')
| -rw-r--r-- | arch/sh/drivers/pci/pci.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c index e36c7b87086..0d6ac7a1db4 100644 --- a/arch/sh/drivers/pci/pci.c +++ b/arch/sh/drivers/pci/pci.c @@ -19,6 +19,7 @@ #include <linux/kernel.h> #include <linux/pci.h> #include <linux/init.h> +#include <linux/dma-debug.h> #include <asm/io.h> static int __init pcibios_init(void) @@ -43,6 +44,8 @@ static int __init pcibios_init(void) pci_fixup_irqs(pci_common_swizzle, pcibios_map_platform_irq); + dma_debug_add_bus(&pci_bus_type); + return 0; } subsys_initcall(pcibios_init); |