diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 15:44:02 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 15:44:02 -0500 |
| commit | 8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0 (patch) | |
| tree | 41758e4da78f94a20813554ef9f5ed9b323a4f8c /arch/sh | |
| parent | cd8200e6d4f9f05e6ea48f7c000be890337396ac (diff) | |
| parent | 70d9d825e0a5a78ec1dacaaaf5c72ff5b0206fab (diff) | |
| download | kernel-crypto-8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0.tar.gz kernel-crypto-8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0.tar.xz kernel-crypto-8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0.zip | |
Merge branch 'master'
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/boards/superh/microdev/setup.c | 2 | ||||
| -rw-r--r-- | arch/sh/drivers/dma/dma-sysfs.c | 1 | ||||
| -rw-r--r-- | arch/sh/kernel/cpufreq.c | 1 | ||||
| -rw-r--r-- | arch/sh/kernel/ptrace.c | 2 | ||||
| -rw-r--r-- | arch/sh/kernel/time.c | 4 |
5 files changed, 4 insertions, 6 deletions
diff --git a/arch/sh/boards/superh/microdev/setup.c b/arch/sh/boards/superh/microdev/setup.c index c18919941ec..1c1d65fb12d 100644 --- a/arch/sh/boards/superh/microdev/setup.c +++ b/arch/sh/boards/superh/microdev/setup.c @@ -13,7 +13,7 @@ #include <linux/config.h> #include <linux/init.h> -#include <linux/device.h> +#include <linux/platform_device.h> #include <linux/ioport.h> #include <asm/io.h> #include <asm/mach/irq.h> diff --git a/arch/sh/drivers/dma/dma-sysfs.c b/arch/sh/drivers/dma/dma-sysfs.c index 71a6d4e7809..6e3b58bd879 100644 --- a/arch/sh/drivers/dma/dma-sysfs.c +++ b/arch/sh/drivers/dma/dma-sysfs.c @@ -13,6 +13,7 @@ #include <linux/init.h> #include <linux/sysdev.h> #include <linux/module.h> +#include <linux/string.h> #include <asm/dma.h> static struct sysdev_class dma_sysclass = { diff --git a/arch/sh/kernel/cpufreq.c b/arch/sh/kernel/cpufreq.c index e0b384bef55..47abf6e49df 100644 --- a/arch/sh/kernel/cpufreq.c +++ b/arch/sh/kernel/cpufreq.c @@ -20,6 +20,7 @@ #include <linux/delay.h> #include <linux/cpumask.h> #include <linux/smp.h> +#include <linux/sched.h> /* set_cpus_allowed() */ #include <asm/processor.h> #include <asm/watchdog.h> diff --git a/arch/sh/kernel/ptrace.c b/arch/sh/kernel/ptrace.c index b28919b6568..1fbe5a428e3 100644 --- a/arch/sh/kernel/ptrace.c +++ b/arch/sh/kernel/ptrace.c @@ -80,7 +80,7 @@ void ptrace_disable(struct task_struct *child) /* nothing to do.. */ } -asmlinkage int sys_ptrace(long request, long pid, long addr, long data) +asmlinkage long sys_ptrace(long request, long pid, long addr, long data) { struct task_struct *child; struct user * dummy = NULL; diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c index 02ca69918d7..671b876416b 100644 --- a/arch/sh/kernel/time.c +++ b/arch/sh/kernel/time.c @@ -56,10 +56,6 @@ extern unsigned long wall_jiffies; #define TICK_SIZE (tick_nsec / 1000) DEFINE_SPINLOCK(tmu0_lock); -u64 jiffies_64 = INITIAL_JIFFIES; - -EXPORT_SYMBOL(jiffies_64); - /* XXX: Can we initialize this in a routine somewhere? Dreamcast doesn't want * these routines anywhere... */ #ifdef CONFIG_SH_RTC |