git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
sparc
/
kernel
/
ttable.S
diff --git
a/arch/sparc/kernel/ttable.S
b/arch/sparc/kernel/ttable.S
index
76d837f
..
c6dfdaa
100644
(file)
--- a/
arch/sparc/kernel/ttable.S
+++ b/
arch/sparc/kernel/ttable.S
@@
-64,7
+64,7
@@
tl0_irq6: TRAP_IRQ(smp_call_function_single_client, 6)
tl0_irq6: BTRAP(0x46)
#endif
tl0_irq7: TRAP_IRQ(deferred_pcr_work_irq, 7)
-#if
def CONFIG_KGDB
+#if
defined(CONFIG_KGDB) && defined(CONFIG_SMP)
tl0_irq8: TRAP_IRQ(smp_kgdb_capture_client, 8)
#else
tl0_irq8: BTRAP(0x48)