diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 19:06:29 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 19:06:29 -0400 |
| commit | 502c7f1dd566e7ca8aabdb755182664c5fdaebf1 (patch) | |
| tree | 31934a4da45c0cb83acd118a181db4c51967ac8a /arch/sparc/kernel/setup.c | |
| parent | 2cba582a49f1535c1a12a687cfb3dab713c22cc4 (diff) | |
| parent | 8f3d17fb7bcb7c255197d11469fb5e9695c9d2f4 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/sparc/kernel/setup.c')
| -rw-r--r-- | arch/sparc/kernel/setup.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sparc/kernel/setup.c b/arch/sparc/kernel/setup.c index 55352ed85e8a..53c192a4982f 100644 --- a/arch/sparc/kernel/setup.c +++ b/arch/sparc/kernel/setup.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | #include <linux/spinlock.h> | 32 | #include <linux/spinlock.h> |
| 33 | #include <linux/root_dev.h> | 33 | #include <linux/root_dev.h> |
| 34 | 34 | ||
| 35 | #include <asm/segment.h> | ||
| 36 | #include <asm/system.h> | 35 | #include <asm/system.h> |
| 37 | #include <asm/io.h> | 36 | #include <asm/io.h> |
| 38 | #include <asm/processor.h> | 37 | #include <asm/processor.h> |