diff --git a/[refs] b/[refs]
index a9b23c76b019..3cbdc4d8101e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1da4f9894c243a9c58c505fd8f3e6cc0709a8825
+refs/heads/master: ac86ccc637458dea53077823f98bc3e1b874d478
diff --git a/trunk/lib/swiotlb.c b/trunk/lib/swiotlb.c
index 785046e4c3ab..5a7d0a4a9da3 100644
--- a/trunk/lib/swiotlb.c
+++ b/trunk/lib/swiotlb.c
@@ -22,7 +22,6 @@
 #include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
-#include <linux/swiotlb.h>
 #include <linux/string.h>
 #include <linux/swiotlb.h>
 #include <linux/pfn.h>
@@ -777,8 +776,6 @@ swiotlb_sync_single_range_for_device(struct device *hwdev, dma_addr_t dev_addr,
 				  SYNC_FOR_DEVICE);
 }
 
-void swiotlb_unmap_sg_attrs(struct device *, struct scatterlist *, int, int,
-			    struct dma_attrs *);
 /*
  * Map a set of buffers described by scatterlist in streaming mode for DMA.
  * This is the scatter-gather version of the above swiotlb_map_single