diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-09-08 17:27:13 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-09-08 17:27:13 -0400 |
| commit | 344a076110f4ecb16ea6d286b63be696604982ed (patch) | |
| tree | def6e229efdb6ee91b631b6695bf7f9ace8e2719 /arch/ia64/ia32/ia32_entry.S | |
| parent | 9b17e7e74e767d8a494a74c3c459aeecd1e08c5f (diff) | |
| parent | 1b11d78cf87a7014f96e5b7fa2e1233cc8081a00 (diff) | |
[IA64] Manual merge fix for 3 files
arch/ia64/Kconfig
arch/ia64/kernel/acpi.c
include/asm-ia64/irq.h
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/ia32/ia32_entry.S')
| -rw-r--r-- | arch/ia64/ia32/ia32_entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/ia32/ia32_entry.S b/arch/ia64/ia32/ia32_entry.S index 829a6d80711c..0708edb06cc4 100644 --- a/arch/ia64/ia32/ia32_entry.S +++ b/arch/ia64/ia32/ia32_entry.S | |||
| @@ -215,7 +215,7 @@ ia32_syscall_table: | |||
| 215 | data8 sys32_fork | 215 | data8 sys32_fork |
| 216 | data8 sys_read | 216 | data8 sys_read |
| 217 | data8 sys_write | 217 | data8 sys_write |
| 218 | data8 sys32_open /* 5 */ | 218 | data8 compat_sys_open /* 5 */ |
| 219 | data8 sys_close | 219 | data8 sys_close |
| 220 | data8 sys32_waitpid | 220 | data8 sys32_waitpid |
| 221 | data8 sys_creat | 221 | data8 sys_creat |