git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6 into test
[pandora-kernel.git]
/
arch
/
microblaze
/
include
/
asm
/
pci.h
diff --git
a/arch/microblaze/include/asm/pci.h
b/arch/microblaze/include/asm/pci.h
index
5a388ee
..
2232ff9
100644
(file)
--- a/
arch/microblaze/include/asm/pci.h
+++ b/
arch/microblaze/include/asm/pci.h
@@
-165,5
+165,7
@@
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 */