diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 05:39:31 +0300 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 05:39:31 +0300 |
| commit | c2cc87ca9561ddfe744d446789cc10f507e87db9 (patch) | |
| tree | d505fc0110eb1a3d8750ba2f67648c131f0d9aca /arch/xtensa | |
| parent | ce1eeb95fc4eb25109c00bea3e83a87eeff6b07d (diff) | |
| parent | 7015faa7df829876a0f931cd18aa6d7c24a1b581 (diff) | |
| download | linux-c2cc87ca9561ddfe744d446789cc10f507e87db9.tar.xz | |
Merge branch 'master'
Diffstat (limited to 'arch/xtensa')
| -rw-r--r-- | arch/xtensa/kernel/platform.c | 1 | ||||
| -rw-r--r-- | arch/xtensa/kernel/ptrace.c | 2 | ||||
| -rw-r--r-- | arch/xtensa/kernel/time.c | 3 | ||||
| -rw-r--r-- | arch/xtensa/platform-iss/network.c | 1 |
4 files changed, 3 insertions, 4 deletions
diff --git a/arch/xtensa/kernel/platform.c b/arch/xtensa/kernel/platform.c index 03674daabc66..a17930747f20 100644 --- a/arch/xtensa/kernel/platform.c +++ b/arch/xtensa/kernel/platform.c @@ -18,6 +18,7 @@ #include <linux/time.h> #include <asm/platform.h> #include <asm/timex.h> +#include <asm/param.h> /* HZ */ #define _F(r,f,a,b) \ r __platform_##f a b; \ diff --git a/arch/xtensa/kernel/ptrace.c b/arch/xtensa/kernel/ptrace.c index 2659efdd4e99..14460743de07 100644 --- a/arch/xtensa/kernel/ptrace.c +++ b/arch/xtensa/kernel/ptrace.c @@ -45,7 +45,7 @@ void ptrace_disable(struct task_struct *child) /* Nothing to do.. */ } -int sys_ptrace(long request, long pid, long addr, long data) +long sys_ptrace(long request, long pid, long addr, long data) { struct task_struct *child; int ret = -EPERM; diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c index 8e423d1335ce..cb6e38ed2b1d 100644 --- a/arch/xtensa/kernel/time.c +++ b/arch/xtensa/kernel/time.c @@ -29,9 +29,6 @@ extern volatile unsigned long wall_jiffies; -u64 jiffies_64 = INITIAL_JIFFIES; -EXPORT_SYMBOL(jiffies_64); - spinlock_t rtc_lock = SPIN_LOCK_UNLOCKED; EXPORT_SYMBOL(rtc_lock); diff --git a/arch/xtensa/platform-iss/network.c b/arch/xtensa/platform-iss/network.c index 498d7dced1f4..0682ffd38175 100644 --- a/arch/xtensa/platform-iss/network.c +++ b/arch/xtensa/platform-iss/network.c @@ -33,6 +33,7 @@ #include <linux/ethtool.h> #include <linux/rtnetlink.h> #include <linux/timer.h> +#include <linux/platform_device.h> #include <xtensa/simcall.h> |