diff --git a/[refs] b/[refs]
index e012eefaf922..c1a699121d4e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9321b8cbbbf3a8dbd4748e3722facaeb8401bd13
+refs/heads/master: 791b897ccd1a2c6c184b88ca6d1aaf053499c3df
diff --git a/trunk/include/asm-x86/dma-mapping.h b/trunk/include/asm-x86/dma-mapping.h
index c2ddd3d1b883..f14b04d8baee 100644
--- a/trunk/include/asm-x86/dma-mapping.h
+++ b/trunk/include/asm-x86/dma-mapping.h
@@ -57,6 +57,7 @@ struct dma_mapping_ops {
 };
 
 extern const struct dma_mapping_ops *dma_ops;
+extern const struct dma_mapping_ops nommu_dma_ops;
 
 static inline int dma_mapping_error(dma_addr_t dma_addr)
 {