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/sh | |
| parent | fb9c690a18b3d66925a65b17441c37fa14d4370b (diff) | |
Merge with 2.4.0-test7.
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/kernel/cf-enabler.c | 1 | ||||
| -rw-r--r-- | arch/sh/kernel/entry.S | 3 | ||||
| -rw-r--r-- | arch/sh/kernel/io.c | 1 | ||||
| -rw-r--r-- | arch/sh/kernel/io_generic.c | 1 | ||||
| -rw-r--r-- | arch/sh/kernel/mach_se.c | 1 | ||||
| -rw-r--r-- | arch/sh/kernel/mach_unknown.c | 1 | ||||
| -rw-r--r-- | arch/sh/kernel/setup_cqreek.c | 1 |
7 files changed, 5 insertions, 4 deletions
diff --git a/arch/sh/kernel/cf-enabler.c b/arch/sh/kernel/cf-enabler.c index c446a1151..90701ad80 100644 --- a/arch/sh/kernel/cf-enabler.c +++ b/arch/sh/kernel/cf-enabler.c @@ -8,7 +8,6 @@ * Enable the CF configuration. */ -#include <linux/config.h> #include <linux/init.h> #include <asm/io.h> diff --git a/arch/sh/kernel/entry.S b/arch/sh/kernel/entry.S index 4e57175e7..7335803da 100644 --- a/arch/sh/kernel/entry.S +++ b/arch/sh/kernel/entry.S @@ -1106,6 +1106,7 @@ ENTRY(sys_call_table) .long SYMBOL_NAME(sys_pivot_root) .long SYMBOL_NAME(sys_mincore) .long SYMBOL_NAME(sys_madvise) + .long SYMBOL_NAME(sys_getdents64) /* 220 */ /* * NOTE!! This doesn't have to be exact - we just have @@ -1113,7 +1114,7 @@ ENTRY(sys_call_table) * entries. Don't panic if you notice that this hasn't * been shrunk every time we add a new system call. */ - .rept NR_syscalls-219 + .rept NR_syscalls-220 .long SYMBOL_NAME(sys_ni_syscall) .endr diff --git a/arch/sh/kernel/io.c b/arch/sh/kernel/io.c index 27f250f9f..fca718ece 100644 --- a/arch/sh/kernel/io.c +++ b/arch/sh/kernel/io.c @@ -7,7 +7,6 @@ * Also definitions of machine independant IO functions. */ -#include <linux/config.h> #include <asm/io.h> unsigned int _inb(unsigned long port) diff --git a/arch/sh/kernel/io_generic.c b/arch/sh/kernel/io_generic.c index 9e5793450..c3d195704 100644 --- a/arch/sh/kernel/io_generic.c +++ b/arch/sh/kernel/io_generic.c @@ -13,7 +13,6 @@ * */ -#include <linux/config.h> #include <asm/io.h> #include <asm/machvec.h> diff --git a/arch/sh/kernel/mach_se.c b/arch/sh/kernel/mach_se.c index ce142a399..17b09c5c4 100644 --- a/arch/sh/kernel/mach_se.c +++ b/arch/sh/kernel/mach_se.c @@ -9,6 +9,7 @@ * Machine vector for the Hitachi SolutionEngine */ +#include <linux/config.h> #include <linux/init.h> #include <asm/machvec.h> diff --git a/arch/sh/kernel/mach_unknown.c b/arch/sh/kernel/mach_unknown.c index 895a65c1d..8e91632c4 100644 --- a/arch/sh/kernel/mach_unknown.c +++ b/arch/sh/kernel/mach_unknown.c @@ -9,6 +9,7 @@ * Machine specific code for an unknown machine (internal peripherials only) */ +#include <linux/config.h> #include <linux/init.h> #include <asm/machvec.h> diff --git a/arch/sh/kernel/setup_cqreek.c b/arch/sh/kernel/setup_cqreek.c index 3e0422154..ea5dd7ece 100644 --- a/arch/sh/kernel/setup_cqreek.c +++ b/arch/sh/kernel/setup_cqreek.c @@ -8,6 +8,7 @@ * */ +#include <linux/config.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/irq.h> |