diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-10 00:51:29 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-10 00:51:29 -0500 |
| commit | d6d93856cb90eeb07062ad938bd26f554bf1b9b9 (patch) | |
| tree | eeec5011a42f38d3dfe7b61788b7ac1cc890edeb /include/linux/smp.h | |
| parent | 8f75015f33c3005e0bbf83ffc0d5e0b4262cc03d (diff) | |
| parent | ad71f123a9e9b809f6c829db1222ce0423a1153c (diff) | |
Merge ../powerpc-merge
Diffstat (limited to 'include/linux/smp.h')
| -rw-r--r-- | include/linux/smp.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/smp.h b/include/linux/smp.h index 9dfa3ee769ae..44153fdf73fc 100644 --- a/include/linux/smp.h +++ b/include/linux/smp.h | |||
| @@ -17,7 +17,6 @@ extern void cpu_idle(void); | |||
| 17 | #include <linux/compiler.h> | 17 | #include <linux/compiler.h> |
| 18 | #include <linux/thread_info.h> | 18 | #include <linux/thread_info.h> |
| 19 | #include <asm/smp.h> | 19 | #include <asm/smp.h> |
| 20 | #include <asm/bug.h> | ||
| 21 | 20 | ||
| 22 | /* | 21 | /* |
| 23 | * main cross-CPU interfaces, handles INIT, TLB flush, STOP, etc. | 22 | * main cross-CPU interfaces, handles INIT, TLB flush, STOP, etc. |