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/kernel | |
| parent | 39fbe47377062200acc26ea0ccef223b4399a82c (diff) | |
| parent | d8971fcb702e24d1e22c77fd1772f182ffee87e3 (diff) | |
Merge HEAD from /spare/repo/linux-2.6/.git
Diffstat (limited to 'arch/sparc/kernel')
| -rw-r--r-- | arch/sparc/kernel/setup.c | 1 | ||||
| -rw-r--r-- | arch/sparc/kernel/tick14.c | 1 | ||||
| -rw-r--r-- | arch/sparc/kernel/time.c | 1 |
3 files changed, 0 insertions, 3 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> |
diff --git a/arch/sparc/kernel/tick14.c b/arch/sparc/kernel/tick14.c index fd8005a3e6bd..591547af4c65 100644 --- a/arch/sparc/kernel/tick14.c +++ b/arch/sparc/kernel/tick14.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/interrupt.h> | 19 | #include <linux/interrupt.h> |
| 20 | 20 | ||
| 21 | #include <asm/oplib.h> | 21 | #include <asm/oplib.h> |
| 22 | #include <asm/segment.h> | ||
| 23 | #include <asm/timer.h> | 22 | #include <asm/timer.h> |
| 24 | #include <asm/mostek.h> | 23 | #include <asm/mostek.h> |
| 25 | #include <asm/system.h> | 24 | #include <asm/system.h> |
diff --git a/arch/sparc/kernel/time.c b/arch/sparc/kernel/time.c index 6486cbf2efe9..3b759aefc170 100644 --- a/arch/sparc/kernel/time.c +++ b/arch/sparc/kernel/time.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | #include <linux/profile.h> | 32 | #include <linux/profile.h> |
| 33 | 33 | ||
| 34 | #include <asm/oplib.h> | 34 | #include <asm/oplib.h> |
| 35 | #include <asm/segment.h> | ||
| 36 | #include <asm/timer.h> | 35 | #include <asm/timer.h> |
| 37 | #include <asm/mostek.h> | 36 | #include <asm/mostek.h> |
| 38 | #include <asm/system.h> | 37 | #include <asm/system.h> |