---

yaml --- r: 330375 b: refs/heads/master c: 4d56dec h: refs/heads/master i: 330373: 7f96091 330371: 975b428 330367: 5c17732 v: v3
git-mirror · Sep 19, 2012 · b38245e · b38245e
1 parent 1acf9e1
commit b38245e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 721c0705906e2ba69907fd2ca837bec6b6a8dbcb
+refs/heads/master: 4d56dec5dca496655ef035ef3b80f7c47dc22b77
diff --git a/trunk/arch/powerpc/sysdev/fsl_pci.c b/trunk/arch/powerpc/sysdev/fsl_pci.c
@@ -864,7 +864,9 @@ static int __devinit fsl_pci_probe(struct platform_device *pdev)
 {
 	int ret;
 	struct device_node *node;
+#ifdef CONFIG_SWIOTLB
 	struct pci_controller *hose;
+#endif
 
 	node = pdev->dev.of_node;
 	ret = fsl_add_bridge(node, fsl_pci_primary == node);