From b6d3aa4604caf725dcc23e7b490545d00c0085f4 Mon Sep 17 00:00:00 2001
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Mon, 13 Aug 2012 11:00:08 -0400
Subject: [PATCH] --- yaml --- r: 329145 b: refs/heads/master c:
 6d7083eee3bc088d1fc30eefabd6263bca40c95a h: refs/heads/master i:   329143:
 3bdd303d82af73cc7b0a3711fc5d1a66b9dcf281 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/x86/xen/pci-swiotlb-xen.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 59186eb7391b..5038e85defbe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8752fd9a4106c5efe324109df133692d5fcbffc
+refs/heads/master: 6d7083eee3bc088d1fc30eefabd6263bca40c95a
diff --git a/trunk/arch/x86/xen/pci-swiotlb-xen.c b/trunk/arch/x86/xen/pci-swiotlb-xen.c
index 2d58b3ff4fae..1ab45941502d 100644
--- a/trunk/arch/x86/xen/pci-swiotlb-xen.c
+++ b/trunk/arch/x86/xen/pci-swiotlb-xen.c
@@ -63,6 +63,6 @@ void __init pci_xen_swiotlb_init(void)
 	}
 }
 IOMMU_INIT_FINISH(pci_xen_swiotlb_detect,
-		  0,
+		  NULL,
 		  pci_xen_swiotlb_init,
-		  0);
+		  NULL);