diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 17:06:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 17:06:51 -0800 |
| commit | 0bdd340c092b0936f78a54bdbd3927463ed4fca3 (patch) | |
| tree | d9215d382cdc4c2dc6366a2c551079590e8b8216 /arch/ia64/sn/kernel/mca.c | |
| parent | 9908104935325bd6beba67d637b6f5396d47075c (diff) | |
| parent | f478af9dc58c01880832a321c3eea7703772c420 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'arch/ia64/sn/kernel/mca.c')
| -rw-r--r-- | arch/ia64/sn/kernel/mca.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/ia64/sn/kernel/mca.c b/arch/ia64/sn/kernel/mca.c index 9ab684d1bb5..3db62f24596 100644 --- a/arch/ia64/sn/kernel/mca.c +++ b/arch/ia64/sn/kernel/mca.c @@ -3,7 +3,7 @@ * License. See the file "COPYING" in the main directory of this archive * for more details. * - * Copyright (c) 2000-2004 Silicon Graphics, Inc. All Rights Reserved. + * Copyright (c) 2000-2006 Silicon Graphics, Inc. All Rights Reserved. */ #include <linux/types.h> @@ -137,7 +137,8 @@ int sn_salinfo_platform_oemdata(const u8 *sect_header, u8 **oemdata, u64 *oemdat static int __init sn_salinfo_init(void) { - salinfo_platform_oemdata = &sn_salinfo_platform_oemdata; + if (ia64_platform_is("sn2")) + salinfo_platform_oemdata = &sn_salinfo_platform_oemdata; return 0; } |