diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-12 16:07:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-12 16:07:48 -0700 |
| commit | ddc752a4068088bfc5558a3f72e4f7cca3fc1210 (patch) | |
| tree | 1effbc4fdae3c14cfe4f2bffa2f601ec6c1d7776 /arch/ia64/include/asm/sal.h | |
| parent | 31bad9246b5e17d547430697791acca5e9712333 (diff) | |
| parent | 430ac5ba9c74f236ddd695b1282a889630cb4f91 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] use bcd2bin/bin2bcd
[IA64] Ensure cpu0 can access per-cpu variables in early boot code
Diffstat (limited to 'arch/ia64/include/asm/sal.h')
| -rw-r--r-- | arch/ia64/include/asm/sal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/sal.h b/arch/ia64/include/asm/sal.h index 89594b442f8..ea310c0812a 100644 --- a/arch/ia64/include/asm/sal.h +++ b/arch/ia64/include/asm/sal.h @@ -236,7 +236,7 @@ extern struct ia64_sal_desc_ptc *ia64_ptc_domain_info; extern unsigned short sal_revision; /* supported SAL spec revision */ extern unsigned short sal_version; /* SAL version; OEM dependent */ -#define SAL_VERSION_CODE(major, minor) ((BIN2BCD(major) << 8) | BIN2BCD(minor)) +#define SAL_VERSION_CODE(major, minor) ((bin2bcd(major) << 8) | bin2bcd(minor)) extern const char *ia64_sal_strerror (long status); extern void ia64_sal_init (struct ia64_sal_systab *sal_systab); |