From 61e10de8426cd8a615cf86f3349f4064138e046d Mon Sep 17 00:00:00 2001
From: John Linn <john.linn@xilinx.com>
Date: Wed, 24 Feb 2010 12:55:02 -0700
Subject: [PATCH] --- yaml --- r: 331457 b: refs/heads/master c:
 c74c8b1dcbaa890a064a5892e29cec5ce42d5b84 h: refs/heads/master i:   331455:
 d06bfff7c9f22b7046525d351493c8cf45f03f26 v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/microblaze/include/asm/io.h  | 4 ++++
 trunk/arch/microblaze/include/asm/pci.h | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a70583dc96d3..f374419dc269 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aaa5241ebb53733663775c8a044004d63a126eb6
+refs/heads/master: c74c8b1dcbaa890a064a5892e29cec5ce42d5b84
diff --git a/trunk/arch/microblaze/include/asm/io.h b/trunk/arch/microblaze/include/asm/io.h
index e4a797478603..4fbfdc1ac7f8 100644
--- a/trunk/arch/microblaze/include/asm/io.h
+++ b/trunk/arch/microblaze/include/asm/io.h
@@ -35,6 +35,10 @@ extern resource_size_t isa_mem_base;
 
 #define IO_SPACE_LIMIT (0xFFFFFFFF)
 
+/* the following is needed to support PCI with some drivers */
+
+#define mmiowb()
+
 static inline unsigned char __raw_readb(const volatile void __iomem *addr)
 {
 	return *(volatile unsigned char __force *)addr;
diff --git a/trunk/arch/microblaze/include/asm/pci.h b/trunk/arch/microblaze/include/asm/pci.h
index a0da88bf70c5..41cc841091b0 100644
--- a/trunk/arch/microblaze/include/asm/pci.h
+++ b/trunk/arch/microblaze/include/asm/pci.h
@@ -22,6 +22,8 @@
 #include <asm/prom.h>
 #include <asm/pci-bridge.h>
 
+#include <asm-generic/pci-dma-compat.h>
+
 #define PCIBIOS_MIN_IO		0x1000
 #define PCIBIOS_MIN_MEM		0x10000000