diff options
| author | Wim Van Sebroeck <wim@iguana.be> | 2007-05-11 15:03:13 -0400 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2007-05-11 15:03:13 -0400 |
| commit | 5c34202b8bf942da411b6599668a76b07449bbfd (patch) | |
| tree | 5719c361321eaddc8e4f1b0c8a7994f0e9a6fdd3 /arch/sparc/kernel/process.c | |
| parent | 0d4804b31f91cfbcff6d62af0bc09a893a1c8ae0 (diff) | |
| parent | 1f8a6b658a943b4f04a1fc7b3a420360202c86cd (diff) | |
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/sparc/kernel/process.c')
| -rw-r--r-- | arch/sparc/kernel/process.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sparc/kernel/process.c b/arch/sparc/kernel/process.c index fc874e63a499..2940d2c1a778 100644 --- a/arch/sparc/kernel/process.c +++ b/arch/sparc/kernel/process.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #include <linux/user.h> | 23 | #include <linux/user.h> |
| 24 | #include <linux/a.out.h> | 24 | #include <linux/a.out.h> |
| 25 | #include <linux/smp.h> | 25 | #include <linux/smp.h> |
| 26 | #include <linux/smp_lock.h> | ||
| 27 | #include <linux/reboot.h> | 26 | #include <linux/reboot.h> |
| 28 | #include <linux/delay.h> | 27 | #include <linux/delay.h> |
| 29 | #include <linux/pm.h> | 28 | #include <linux/pm.h> |