Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 311819
b: refs/heads/master
c: 6b4fa63
h: refs/heads/master
i:
  311817: fbfae8d
  311815: bf2fc5f
v: v3
  • Loading branch information
Geert Uytterhoeven authored and Linus Torvalds committed Jul 11, 2012
1 parent a342f18 commit 6cb3d64
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 77cb621c87ee5c1bbf1b0c8f3e6518482d1688a9
refs/heads/master: 6b4fa63a9e5696fa43f25143f104ef0bea642222
4 changes: 2 additions & 2 deletions trunk/arch/mn10300/kernel/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,9 @@ mn10300_cpupic_setaffinity(struct irq_data *d, const struct cpumask *mask,
case SC1TXIRQ:
#ifdef CONFIG_MN10300_TTYSM1_TIMER12
case TM12IRQ:
#elif CONFIG_MN10300_TTYSM1_TIMER9
#elif defined(CONFIG_MN10300_TTYSM1_TIMER9)
case TM9IRQ:
#elif CONFIG_MN10300_TTYSM1_TIMER3
#elif defined(CONFIG_MN10300_TTYSM1_TIMER3)
case TM3IRQ:
#endif /* CONFIG_MN10300_TTYSM1_TIMER12 */
#endif /* CONFIG_MN10300_TTYSM1 */
Expand Down

0 comments on commit 6cb3d64

Please sign in to comment.