diff options
| author | John Stultz <john.stultz@linaro.org> | 2013-05-15 12:42:15 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-05-15 12:42:15 -0700 |
| commit | 15a6affec4449b54afba15ab7edbad0cac2736d3 (patch) | |
| tree | f2fa815f74be0b56acd05e62113600a7113d48a9 /arch/microblaze/include/asm/pci.h | |
| parent | cd432fc233f4e7aba43b4fe499a4445f0f6ee1c6 (diff) | |
| parent | f722406faae2d073cc1d01063d1123c35425939e (diff) | |
Merge tag 'v3.10-rc1' into linaro-android-3.10-experimental-mergetracking-linaro-android-3.10-llct-20130518.0
Linux 3.10-rc1
Diffstat (limited to 'arch/microblaze/include/asm/pci.h')
| -rw-r--r-- | arch/microblaze/include/asm/pci.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h index 41cc841091b0..d52abb6812fa 100644 --- a/arch/microblaze/include/asm/pci.h +++ b/arch/microblaze/include/asm/pci.h @@ -153,7 +153,5 @@ extern void __init xilinx_pci_init(void); static inline void __init xilinx_pci_init(void) { return; } #endif -#include <asm-generic/pci-dma-compat.h> - #endif /* __KERNEL__ */ #endif /* __ASM_MICROBLAZE_PCI_H */ |