diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-06-25 11:57:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-06-25 11:57:32 -0400 |
| commit | bbe5d235ee201705530a7153b57e141cd77d818b (patch) | |
| tree | e98c31b4cb2ced6357a87a02596f9ecdbd6dbb26 /include/asm-um/smp.h | |
| parent | 189acaaef81b1d71aedd0d28810de24160c2e781 (diff) | |
| parent | dfd8317d3340f03bc06eba6b58f0ec0861da4a13 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-um/smp.h')
| -rw-r--r-- | include/asm-um/smp.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-um/smp.h b/include/asm-um/smp.h index aeda6657f366..ca552261ed1f 100644 --- a/include/asm-um/smp.h +++ b/include/asm-um/smp.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | #ifdef CONFIG_SMP | 4 | #ifdef CONFIG_SMP |
| 5 | 5 | ||
| 6 | #include "linux/config.h" | ||
| 7 | #include "linux/bitops.h" | 6 | #include "linux/bitops.h" |
| 8 | #include "asm/current.h" | 7 | #include "asm/current.h" |
| 9 | #include "linux/cpumask.h" | 8 | #include "linux/cpumask.h" |