diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 20:46:21 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 20:46:21 -0400 |
| commit | 70ac4385a13f78bc478f26d317511893741b05bd (patch) | |
| tree | dafc7f3018295fc4ee00339889e4f35d5b9d7743 /include/asm-sparc/system.h | |
| parent | d59bf96cdde5b874a57bfd1425faa45da915d0b7 (diff) | |
| parent | 077e98945db7e54a9865b5f29a1f02f531eca414 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
include/linux/nfs_fs.h
Fixed up conflict with kernel header updates.
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> |