diff options
author | Tony Luck <tony.luck@intel.com> | 2009-06-17 09:35:24 -0700 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2009-06-17 09:35:24 -0700 |
commit | 27f70c3117194f98beb009dc48bb2aa267f505bf (patch) | |
tree | 22afa3fb31376da9e37f09a78745afe3f16fde8a /arch/ia64/include/asm/sn/sn_sal.h | |
parent | [IA64] Fix build error in paravirt_patchlist.c (diff) | |
parent | [IA64] Convert ia64 to use int-ll64.h (diff) | |
download | linux-dev-27f70c3117194f98beb009dc48bb2aa267f505bf.tar.xz linux-dev-27f70c3117194f98beb009dc48bb2aa267f505bf.zip |
Pull for-2.6.31 into release
Diffstat (limited to 'arch/ia64/include/asm/sn/sn_sal.h')
-rw-r--r-- | arch/ia64/include/asm/sn/sn_sal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/sn/sn_sal.h b/arch/ia64/include/asm/sn/sn_sal.h index e310fc0135dc..1f5ff470a5a1 100644 --- a/arch/ia64/include/asm/sn/sn_sal.h +++ b/arch/ia64/include/asm/sn/sn_sal.h @@ -929,7 +929,7 @@ ia64_sn_sysctl_tio_clock_reset(nasid_t nasid) /* * Get the associated ioboard type for a given nasid. */ -static inline s64 +static inline long ia64_sn_sysctl_ioboard_get(nasid_t nasid, u16 *ioboard) { struct ia64_sal_retval isrv; |