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)
 {