Pull for-2.6.31 into release

2009-06-17 09:35:24 -07:00
parent d186b86ffc e088a4ad7f
commit 27f70c3117
48 changed files with 236 additions and 231 deletions
--- 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;