diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-19 00:08:20 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-19 00:08:20 -0400 |
| commit | bb803cfbecb03a0cf8dc7e1864f18dda6631af00 (patch) | |
| tree | 6c0989693bea6f50cfa5c6bb14f52ec19668def3 /arch/m32r/include/asm/pci.h | |
| parent | 3878fb6fdbceecca20b15748f807340854220f06 (diff) | |
| parent | 511e11e396dc596825ce04d53d7f6d579404bc01 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/scsi/fcoe/fcoe.c
Diffstat (limited to 'arch/m32r/include/asm/pci.h')
| -rw-r--r-- | arch/m32r/include/asm/pci.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/m32r/include/asm/pci.h b/arch/m32r/include/asm/pci.h new file mode 100644 index 000000000000..fe785d167db6 --- /dev/null +++ b/arch/m32r/include/asm/pci.h | |||
| @@ -0,0 +1,8 @@ | |||
| 1 | #ifndef _ASM_M32R_PCI_H | ||
| 2 | #define _ASM_M32R_PCI_H | ||
| 3 | |||
| 4 | #include <asm-generic/pci.h> | ||
| 5 | |||
| 6 | #define PCI_DMA_BUS_IS_PHYS (1) | ||
| 7 | |||
| 8 | #endif /* _ASM_M32R_PCI_H */ | ||