diff --git a/[refs] b/[refs]
index da137a2de208..c45b463bd74b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40becd8d5af03ee7935e79c3fccd0d1f380d95b4
+refs/heads/master: 1e19b16a30c34c042f1eaa23db4c99bfad1dac0e
diff --git a/trunk/include/linux/iommu-helper.h b/trunk/include/linux/iommu-helper.h
index 786539e432d7..a6d0586e2bf7 100644
--- a/trunk/include/linux/iommu-helper.h
+++ b/trunk/include/linux/iommu-helper.h
@@ -1,3 +1,6 @@
+#ifndef _LINUX_IOMMU_HELPER_H
+#define _LINUX_IOMMU_HELPER_H
+
 static inline unsigned long iommu_device_max_index(unsigned long size,
 						   unsigned long offset,
 						   u64 dma_mask)
@@ -19,3 +22,5 @@ extern unsigned long iommu_area_alloc(unsigned long *map, unsigned long size,
 				      unsigned long align_mask);
 extern void iommu_area_free(unsigned long *map, unsigned long start,
 			    unsigned int nr);
+
+#endif