diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-28 22:00:09 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-28 22:00:09 +0000 |
| commit | 1a1d77dd589de5a567fa95e36aa6999c704ceca4 (patch) | |
| tree | 141e31f89f18b9fe0831f31852e0435ceaccafc5 /arch/s390 | |
| parent | fb9c690a18b3d66925a65b17441c37fa14d4370b (diff) | |
Merge with 2.4.0-test7.
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/config.in | 2 | ||||
| -rw-r--r-- | arch/s390/kernel/entry.S | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/s390/config.in b/arch/s390/config.in index 7835a0162..cdb88b757 100644 --- a/arch/s390/config.in +++ b/arch/s390/config.in @@ -59,6 +59,8 @@ source fs/Config.in # source drivers/char/Config.in +# source drivers/media/Config.in + mainmenu_option next_comment comment 'Kernel hacking' diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S index 9913d5967..e39e18623 100644 --- a/arch/s390/kernel/entry.S +++ b/arch/s390/kernel/entry.S @@ -603,7 +603,8 @@ sys_call_table: .long sys_pivot_root .long sys_mincore .long sys_madvise - .rept 255-219 + .long sys_getdents64 /* 220 */ + .rept 255-220 .long sys_ni_syscall .endr |