diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-15 02:36:54 +0200 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-15 02:36:54 +0200 |
commit | 7dafd239ab522d38979ebe44d79aa68ad7b1a383 (patch) | |
tree | 04754a0c6495e57c1fe5f417fbfc99272d353c0e /arch/m32r/include/asm/pci.h | |
parent | Merge commit 'origin/master' into next (diff) | |
parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sam/kb... (diff) | |
download | linux-7dafd239ab522d38979ebe44d79aa68ad7b1a383.tar.xz linux-7dafd239ab522d38979ebe44d79aa68ad7b1a383.zip |
Merge commit 'origin/master' into next
Diffstat (limited to 'arch/m32r/include/asm/pci.h')
-rw-r--r-- | arch/m32r/include/asm/pci.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/m32r/include/asm/pci.h b/arch/m32r/include/asm/pci.h index fe785d167db6..07d3834c6dec 100644 --- a/arch/m32r/include/asm/pci.h +++ b/arch/m32r/include/asm/pci.h @@ -3,6 +3,4 @@ #include <asm-generic/pci.h> -#define PCI_DMA_BUS_IS_PHYS (1) - #endif /* _ASM_M32R_PCI_H */ |