diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-18 17:43:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-18 17:43:21 -0700 |
| commit | 1fca25427482387689fa27594c992a961d98768f (patch) | |
| tree | 7b152866f3ee7cd71adb22697fe2a798e824b19d /arch/ia64/ia32/ia32_entry.S | |
| parent | b689e83961e6b2e39bf378c1468fd7d7a924656c (diff) | |
| parent | 37c23e7fda6913d133ac12012395e58af1fe24c6 (diff) | |
| download | talos-obmc-linux-1fca25427482387689fa27594c992a961d98768f.tar.gz talos-obmc-linux-1fca25427482387689fa27594c992a961d98768f.zip | |
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 generic compat_old_sys_readdir
[IA64] pci_acpi_scan_root cleanup
[IA64] Shrink shadow_flush_counts to a short array to save 8k of per_cpu area.
[IA64] Remove sn2_defconfig.
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 06efd1f9b800..ff88c48c5d19 100644 --- a/arch/ia64/ia32/ia32_entry.S +++ b/arch/ia64/ia32/ia32_entry.S @@ -262,7 +262,7 @@ ia32_syscall_table: data8 sys_uselib data8 sys_swapon data8 sys_reboot - data8 sys32_readdir + data8 compat_sys_old_readdir data8 sys32_mmap /* 90 */ data8 sys32_munmap data8 sys_truncate |
