diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-09-24 04:07:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-09-24 04:07:35 -0700 |
| commit | 038f9a8f2bb8d02cade66afff652629aba83cf8a (patch) | |
| tree | c02641763b22ea1d972ff60d18071a0bd70cb46a | |
| parent | 494eebab70c3008fd42d80ba4282e7965871d08c (diff) | |
| parent | 064715b2265f792a4f712c6c1681dcc8f403e2a2 (diff) | |
Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk
into ppc970.osdl.org:/home/torvalds/v2.6/linux
| -rw-r--r-- | include/asm-arm/system.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/asm-arm/system.h b/include/asm-arm/system.h index 146a814e53a2..cafe9531cf01 100644 --- a/include/asm-arm/system.h +++ b/include/asm-arm/system.h @@ -98,9 +98,10 @@ #ifndef __ASSEMBLY__ -#include <linux/kernel.h> +#include <linux/linkage.h> struct thread_info; +struct task_struct; /* information about the system we're running on */ extern unsigned int system_rev; @@ -203,8 +204,6 @@ do { \ * `prev' will never be the same as `next'. schedule() itself * contains the memory barrier to tell GCC not to cache `current'. */ -struct thread_info; -struct task_struct; extern struct task_struct *__switch_to(struct task_struct *, struct thread_info *, struct thread_info *); #define switch_to(prev,next,last) \ |