diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-08 10:45:45 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-08 10:45:45 -0400 |
| commit | 364f6c717deef4a3ac4982e670fa9846b43cd060 (patch) | |
| tree | 47e3967d6e2220130f2c070e300c97709143b28f /arch/ia64/sn | |
| parent | 4ff4258a3e558814a3d48c50a59cd22f56bbea2f (diff) | |
| parent | 1d6757fbff5bc86e94e59ab0d7bdd7e71351d839 (diff) | |
Automatic merge with /usr/src/ntfs-2.6.git
Diffstat (limited to 'arch/ia64/sn')
| -rw-r--r-- | arch/ia64/sn/kernel/setup.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c index 4fb44984afe6..e64cb8175f7a 100644 --- a/arch/ia64/sn/kernel/setup.c +++ b/arch/ia64/sn/kernel/setup.c | |||
| @@ -271,6 +271,8 @@ void __init sn_setup(char **cmdline_p) | |||
| 271 | int major = sn_sal_rev_major(), minor = sn_sal_rev_minor(); | 271 | int major = sn_sal_rev_major(), minor = sn_sal_rev_minor(); |
| 272 | extern void sn_cpu_init(void); | 272 | extern void sn_cpu_init(void); |
| 273 | 273 | ||
| 274 | ia64_sn_plat_set_error_handling_features(); | ||
| 275 | |||
| 274 | /* | 276 | /* |
| 275 | * If the generic code has enabled vga console support - lets | 277 | * If the generic code has enabled vga console support - lets |
| 276 | * get rid of it again. This is a kludge for the fact that ACPI | 278 | * get rid of it again. This is a kludge for the fact that ACPI |