diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-30 11:46:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-30 11:46:16 -0400 |
| commit | 7cece14acd063dd1c4e8933461d44ec6a5a5517b (patch) | |
| tree | a7d2de4acaf64eed207ceab9eb6b2a386ebd7401 /drivers | |
| parent | 95dfec6ae1cb8c03406aac612a5642cbddb676b3 (diff) | |
| parent | 8cd0ae3acc0154f3f9dfa1b4a2b7c02c271533f6 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: remove duplicated include
sparc: Add kgdb support.
kgdbts: Sparc needs sstep emulation.
sparc32: Kill smp_message_pass() and related code.
sparc64: Kill PIL_RESERVED, unused.
sparc64: Split entry.S up into seperate files.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/misc/kgdbts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c index 6d6286c4eeac..30a1af857c7a 100644 --- a/drivers/misc/kgdbts.c +++ b/drivers/misc/kgdbts.c | |||
| @@ -132,7 +132,7 @@ static int send_ack; | |||
| 132 | static int final_ack; | 132 | static int final_ack; |
| 133 | static int hw_break_val; | 133 | static int hw_break_val; |
| 134 | static int hw_break_val2; | 134 | static int hw_break_val2; |
| 135 | #if defined(CONFIG_ARM) || defined(CONFIG_MIPS) | 135 | #if defined(CONFIG_ARM) || defined(CONFIG_MIPS) || defined(CONFIG_SPARC) |
| 136 | static int arch_needs_sstep_emulation = 1; | 136 | static int arch_needs_sstep_emulation = 1; |
| 137 | #else | 137 | #else |
| 138 | static int arch_needs_sstep_emulation; | 138 | static int arch_needs_sstep_emulation; |