diff --git a/[refs] b/[refs]
index 68ea0e4d7434..3d5c0fc7b251 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bfaadcadc9549c7e296e37a0cfe306704e8df739
+refs/heads/master: 2b890bc2ce95e8c141b38ea86100826b46534295
diff --git a/trunk/include/asm-powerpc/iommu.h b/trunk/include/asm-powerpc/iommu.h
index a5e98641a2ae..264ed6242771 100644
--- a/trunk/include/asm-powerpc/iommu.h
+++ b/trunk/include/asm-powerpc/iommu.h
@@ -52,17 +52,9 @@ struct iommu_table {
 struct scatterlist;
 struct device_node;
 
-#ifdef CONFIG_PPC_MULTIPLATFORM
-
-/* Walks all buses and creates iommu tables */
-extern void iommu_setup_pSeries(void);
-extern void iommu_setup_dart(void);
-
 /* Frees table for an individual device node */
 extern void iommu_free_table(struct device_node *dn);
 
-#endif /* CONFIG_PPC_MULTIPLATFORM */
-
 /* Initializes an iommu_table based in values set in the passed-in
  * structure
  */