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 /arch/sparc/mm | |
| parent | 39fbe47377062200acc26ea0ccef223b4399a82c (diff) | |
| parent | d8971fcb702e24d1e22c77fd1772f182ffee87e3 (diff) | |
Merge HEAD from /spare/repo/linux-2.6/.git
Diffstat (limited to 'arch/sparc/mm')
| -rw-r--r-- | arch/sparc/mm/fault.c | 1 | ||||
| -rw-r--r-- | arch/sparc/mm/init.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/sparc/mm/fault.c b/arch/sparc/mm/fault.c index 37f4107bae66..2bbd53f3cafb 100644 --- a/arch/sparc/mm/fault.c +++ b/arch/sparc/mm/fault.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 24 | 24 | ||
| 25 | #include <asm/system.h> | 25 | #include <asm/system.h> |
| 26 | #include <asm/segment.h> | ||
| 27 | #include <asm/page.h> | 26 | #include <asm/page.h> |
| 28 | #include <asm/pgtable.h> | 27 | #include <asm/pgtable.h> |
| 29 | #include <asm/memreg.h> | 28 | #include <asm/memreg.h> |
diff --git a/arch/sparc/mm/init.c b/arch/sparc/mm/init.c index ec2e05028a10..c03babaa0498 100644 --- a/arch/sparc/mm/init.c +++ b/arch/sparc/mm/init.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | #include <linux/bootmem.h> | 25 | #include <linux/bootmem.h> |
| 26 | 26 | ||
| 27 | #include <asm/system.h> | 27 | #include <asm/system.h> |
| 28 | #include <asm/segment.h> | ||
| 29 | #include <asm/vac-ops.h> | 28 | #include <asm/vac-ops.h> |
| 30 | #include <asm/page.h> | 29 | #include <asm/page.h> |
| 31 | #include <asm/pgtable.h> | 30 | #include <asm/pgtable.h> |