diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-04-01 00:22:26 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-04-01 00:22:26 -0400 |
| commit | 399f486286f44d55c4fff0e9cc5d712f2b443489 (patch) | |
| tree | 0c2820b3e04232eaa96f08c1057b87728fb3e7a4 /arch/mips/kernel/head.S | |
| parent | 481419ec9fbdf3f4ec5389c7e91a81b4a7ebee8d (diff) | |
| parent | a9edadbf790d72adf6ebed476cb5caf7743e7e4a (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'arch/mips/kernel/head.S')
| -rw-r--r-- | arch/mips/kernel/head.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/head.S b/arch/mips/kernel/head.S index a24fb7900901..361364501d34 100644 --- a/arch/mips/kernel/head.S +++ b/arch/mips/kernel/head.S | |||
| @@ -195,7 +195,7 @@ NESTED(kernel_entry, 16, sp) # kernel entry point | |||
| 195 | j start_kernel | 195 | j start_kernel |
| 196 | END(kernel_entry) | 196 | END(kernel_entry) |
| 197 | 197 | ||
| 198 | __INIT | 198 | __CPUINIT |
| 199 | 199 | ||
| 200 | #ifdef CONFIG_SMP | 200 | #ifdef CONFIG_SMP |
| 201 | /* | 201 | /* |