diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-12-06 23:51:34 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-12-06 23:51:34 +0000 |
| commit | 230e5ab6a084ed50470f101934782dbf54b0d06b (patch) | |
| tree | 5dd821c8d33f450470588e7a543f74bf74306e9e /arch/ppc | |
| parent | c9b1c8a64c6444d189856f1e26bdcb8b4cd0113a (diff) | |
Merge with Linux 2.1.67.
Diffstat (limited to 'arch/ppc')
| -rw-r--r-- | arch/ppc/config.in | 2 | ||||
| -rw-r--r-- | arch/ppc/kernel/misc.S | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/ppc/config.in b/arch/ppc/config.in index 1cea7ce3f..cdd5c4a03 100644 --- a/arch/ppc/config.in +++ b/arch/ppc/config.in @@ -108,6 +108,8 @@ endmenu source fs/Config.in +source fs/nls/Config.in + source drivers/char/Config.in mainmenu_option next_comment diff --git a/arch/ppc/kernel/misc.S b/arch/ppc/kernel/misc.S index 9c6d013b6..f4174df38 100644 --- a/arch/ppc/kernel/misc.S +++ b/arch/ppc/kernel/misc.S @@ -539,6 +539,7 @@ sys_call_table: .long sys_query_module .long sys_poll .long sys_nfsservctl + .long sys_prctl .long sys_debug - .space (NR_syscalls-170)*4 + .space (NR_syscalls-171)*4 |