From 034afdfe131a7c933d3b0538022169886689d762 Mon Sep 17 00:00:00 2001
From: Jaswinder Singh <jaswinder@infradead.org>
Date: Mon, 21 Jul 2008 22:28:22 +0530
Subject: [PATCH] --- yaml --- r: 110291 b: refs/heads/master c:
 791b897ccd1a2c6c184b88ca6d1aaf053499c3df h: refs/heads/master i:   110289:
 bd3c7e6460a945fd0be22147650927988520c815   110287:
 914436d5d59ebe40576381cac694e1f99570e3f1 v: v3

---
 [refs]                              | 2 +-
 trunk/include/asm-x86/dma-mapping.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

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