diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 19:01:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 19:01:43 -0400 |
| commit | da61396d24e37258817e42537c482e962b4742f7 (patch) | |
| tree | 4293a5d557b8f9fed8a2bac93f1e5c939c7b65c3 /include/asm-sparc64/processor.h | |
| parent | 2f058256cb64e346f4fb4499ff4e0f1c2791a4b4 (diff) | |
| parent | 8f3d17fb7bcb7c255197d11469fb5e9695c9d2f4 (diff) | |
Merge upstream kernel into libata 'passthru' branch
Diffstat (limited to 'include/asm-sparc64/processor.h')
| -rw-r--r-- | include/asm-sparc64/processor.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-sparc64/processor.h b/include/asm-sparc64/processor.h index d0bee2413560..3169f3e2237e 100644 --- a/include/asm-sparc64/processor.h +++ b/include/asm-sparc64/processor.h | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <asm/a.out.h> | 18 | #include <asm/a.out.h> |
| 19 | #include <asm/pstate.h> | 19 | #include <asm/pstate.h> |
| 20 | #include <asm/ptrace.h> | 20 | #include <asm/ptrace.h> |
| 21 | #include <asm/segment.h> | ||
| 22 | #include <asm/page.h> | 21 | #include <asm/page.h> |
| 23 | 22 | ||
| 24 | /* The sparc has no problems with write protection */ | 23 | /* The sparc has no problems with write protection */ |