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/ppc | |
| parent | fb9c690a18b3d66925a65b17441c37fa14d4370b (diff) | |
Merge with 2.4.0-test7.
Diffstat (limited to 'arch/ppc')
| -rw-r--r-- | arch/ppc/config.in | 4 | ||||
| -rw-r--r-- | arch/ppc/kernel/misc.S | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/ppc/config.in b/arch/ppc/config.in index 3e0721cb4..950118eb2 100644 --- a/arch/ppc/config.in +++ b/arch/ppc/config.in @@ -263,6 +263,9 @@ source drivers/video/Config.in endmenu source drivers/char/Config.in + +source drivers/media/Config.in + source fs/Config.in mainmenu_option next_comment @@ -284,6 +287,7 @@ source arch/ppc/8260_io/Config.in fi source drivers/usb/Config.in +source drivers/input/Config.in mainmenu_option next_comment comment 'Kernel hacking' diff --git a/arch/ppc/kernel/misc.S b/arch/ppc/kernel/misc.S index 19a218bd4..081dda7f3 100644 --- a/arch/ppc/kernel/misc.S +++ b/arch/ppc/kernel/misc.S @@ -1216,6 +1216,7 @@ _GLOBAL(sys_call_table) .long sys_pciconfig_write /* 199 */ .long sys_pciconfig_iobase /* 200 */ .long sys_ni_syscall /* 201 - reserved - MacOnLinux - new */ + .long sys_getdents64 /* 202 */ .rept NR_syscalls-201 .long sys_ni_syscall .endr |