diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-30 13:32:29 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-30 13:32:29 -0400 |
| commit | ed735ccbefaf7e5e3ef61418f7e209b8c59308a7 (patch) | |
| tree | b8cc69814d2368b08d0a84c8da0c12028bd04867 /include/asm-sparc/system.h | |
| parent | 39fbe47377062200acc26ea0ccef223b4399a82c (diff) | |
| parent | d8971fcb702e24d1e22c77fd1772f182ffee87e3 (diff) | |
Merge HEAD from /spare/repo/linux-2.6/.git
Diffstat (limited to 'include/asm-sparc/system.h')
| -rw-r--r-- | include/asm-sparc/system.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-sparc/system.h b/include/asm-sparc/system.h index 898562ebe94c..3557781a4bfd 100644 --- a/include/asm-sparc/system.h +++ b/include/asm-sparc/system.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #include <linux/threads.h> /* NR_CPUS */ | 9 | #include <linux/threads.h> /* NR_CPUS */ |
| 10 | #include <linux/thread_info.h> | 10 | #include <linux/thread_info.h> |
| 11 | 11 | ||
| 12 | #include <asm/segment.h> | ||
| 13 | #include <asm/page.h> | 12 | #include <asm/page.h> |
| 14 | #include <asm/psr.h> | 13 | #include <asm/psr.h> |
| 15 | #include <asm/ptrace.h> | 14 | #include <asm/ptrace.h> |