diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 19:24:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 19:24:43 -0400 |
| commit | 76b2bf9b4dee2fb32ef17f5c84a99ce481a14be2 (patch) | |
| tree | 49cd36d6e980044c2a88f2c14cdc9259e0f0f1b4 /include/asm-sparc | |
| parent | 2fca877b68b2b4fc5b94277858a1bedd46017cde (diff) | |
| parent | 8f3d17fb7bcb7c255197d11469fb5e9695c9d2f4 (diff) | |
Merge libata branch 'chs-support' to latest upstream kernel.
Diffstat (limited to 'include/asm-sparc')
| -rw-r--r-- | include/asm-sparc/processor.h | 1 | ||||
| -rw-r--r-- | include/asm-sparc/segment.h | 6 | ||||
| -rw-r--r-- | include/asm-sparc/system.h | 1 |
3 files changed, 0 insertions, 8 deletions
diff --git a/include/asm-sparc/processor.h b/include/asm-sparc/processor.h index 32c9699367c..5a7a1a8d29a 100644 --- a/include/asm-sparc/processor.h +++ b/include/asm-sparc/processor.h @@ -19,7 +19,6 @@ #include <asm/ptrace.h> #include <asm/head.h> #include <asm/signal.h> -#include <asm/segment.h> #include <asm/btfixup.h> #include <asm/page.h> diff --git a/include/asm-sparc/segment.h b/include/asm-sparc/segment.h deleted file mode 100644 index a1b7ffc9eec..00000000000 --- a/include/asm-sparc/segment.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __SPARC_SEGMENT_H -#define __SPARC_SEGMENT_H - -/* Only here because we have some old header files that expect it.. */ - -#endif diff --git a/include/asm-sparc/system.h b/include/asm-sparc/system.h index 898562ebe94..3557781a4bf 100644 --- a/include/asm-sparc/system.h +++ b/include/asm-sparc/system.h @@ -9,7 +9,6 @@ #include <linux/threads.h> /* NR_CPUS */ #include <linux/thread_info.h> -#include <asm/segment.h> #include <asm/page.h> #include <asm/psr.h> #include <asm/ptrace.h> |