From 54f8b9f9b88d67ada5758e1527cc4885e5efdc02 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Mon, 30 Jun 2008 11:35:53 -0700
Subject: [PATCH] --- yaml --- r: 102275 b: refs/heads/master c:
 80be038593dba7aa46fb24a14f0ba83e5ade0edb h: refs/heads/master i:   102273:
 0a1b96e3fc1e1f850aa8245b2a7602248e40f1b9   102271:
 2a3b20fe38f37359b4d29ccfc2b979bae4fc0620 v: v3

---
 [refs]                    | 2 +-
 trunk/include/linux/pci.h | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0c412d9a3761..92540b32f8e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0aea531326d1a17ccef7d9a538429c5b32cf4f12
+refs/heads/master: 80be038593dba7aa46fb24a14f0ba83e5ade0edb
diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h
index 76c9a4a96152..96ebaa8d80e3 100644
--- a/trunk/include/linux/pci.h
+++ b/trunk/include/linux/pci.h
@@ -853,6 +853,11 @@ static inline int pci_set_dma_mask(struct pci_dev *dev, u64 mask)
 	return -EIO;
 }
 
+static inline int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask)
+{
+	return -EIO;
+}
+
 static inline int pci_set_dma_max_seg_size(struct pci_dev *dev,
 					unsigned int size)
 {