Pull for-2.6.31 into release

[firefly-linux-kernel-4.4.55.git] / arch / ia64 / hp / common / sba_iommu.c

diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
index fe63b2dc9d075c8ceabc4e28bc7e246bff31f30a..8cfb001092ab0f79f0cf2c450c39ef5df77e3fd1 100644 (file)
--- a/arch/ia64/hp/common/sba_iommu.c
+++ b/arch/ia64/hp/common/sba_iommu.c
@@ -1787,7 +1787,7 @@ static struct ioc_iommu ioc_iommu_info[] __initdata = {
 };
 
 static struct ioc * __init
-ioc_init(u64 hpa, void *handle)
+ioc_init(unsigned long hpa, void *handle)
 {
        struct ioc *ioc;
        struct ioc_iommu *info;