diff options
| author | Tony Luck <tony.luck@intel.com> | 2009-06-17 18:35:24 +0200 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2009-06-17 18:35:24 +0200 |
| commit | 27f70c3117194f98beb009dc48bb2aa267f505bf (patch) | |
| tree | 22afa3fb31376da9e37f09a78745afe3f16fde8a /arch/ia64/hp/common | |
| parent | [IA64] Fix build error in paravirt_patchlist.c (diff) | |
| parent | [IA64] Convert ia64 to use int-ll64.h (diff) | |
| download | linux-27f70c3117194f98beb009dc48bb2aa267f505bf.tar.xz linux-27f70c3117194f98beb009dc48bb2aa267f505bf.zip | |
Pull for-2.6.31 into release
Diffstat (limited to 'arch/ia64/hp/common')
| -rw-r--r-- | arch/ia64/hp/common/sba_iommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c index fe63b2dc9d07..8cfb001092ab 100644 --- 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; |