diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-06-26 01:31:38 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-06-26 01:31:38 -0400 |
| commit | 4854c7b27f0975a2b629f35ea3996d2968eb7c4f (patch) | |
| tree | 4102bdb70289764a2058aff0f907b13d7cf0e0d1 /include/asm-sparc/system.h | |
| parent | 3cbd5b32cb625f5c0f1b1476d154fac873dd49ce (diff) | |
| parent | fcc18e83e1f6fd9fa6b333735bf0fcd530655511 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-sparc/system.h')
| -rw-r--r-- | include/asm-sparc/system.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-sparc/system.h b/include/asm-sparc/system.h index 58dd162927bb..cb7dda1e5e91 100644 --- a/include/asm-sparc/system.h +++ b/include/asm-sparc/system.h | |||
| @@ -1,10 +1,8 @@ | |||
| 1 | /* $Id: system.h,v 1.86 2001/10/30 04:57:10 davem Exp $ */ | 1 | /* $Id: system.h,v 1.86 2001/10/30 04:57:10 davem Exp $ */ |
| 2 | #include <linux/config.h> | ||
| 3 | 2 | ||
| 4 | #ifndef __SPARC_SYSTEM_H | 3 | #ifndef __SPARC_SYSTEM_H |
| 5 | #define __SPARC_SYSTEM_H | 4 | #define __SPARC_SYSTEM_H |
| 6 | 5 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/kernel.h> | 6 | #include <linux/kernel.h> |
| 9 | #include <linux/threads.h> /* NR_CPUS */ | 7 | #include <linux/threads.h> /* NR_CPUS */ |
| 10 | #include <linux/thread_info.h> | 8 | #include <linux/thread_info.h> |