Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 313818
b: refs/heads/master
c: 357351b
h: refs/heads/master
v: v3
  • Loading branch information
Bob Liu committed Jul 24, 2012
1 parent 23b3942 commit 9ad89dc
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 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: 338881a5045fe211577e1e9c9088b608b81ca698
refs/heads/master: 357351bb4f56300a31e1a746af7479d58f4c68fb
6 changes: 5 additions & 1 deletion trunk/arch/blackfin/mach-common/ints-priority.c
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,10 @@ static int bfin_internal_set_wake_chip(struct irq_data *d, unsigned int state)
return bfin_internal_set_wake(d->irq, state);
}
#else
# define bfin_internal_set_wake(irq, state)
inline int bfin_internal_set_wake(unsigned int irq, unsigned int state)
{
return 0;
}
# define bfin_internal_set_wake_chip NULL
#endif

Expand Down Expand Up @@ -527,6 +530,7 @@ static struct irq_chip bfin_sec_irqchip = {
.irq_eoi = bfin_sec_unmask_irq,
.irq_disable = bfin_sec_disable,
.irq_enable = bfin_sec_enable,
.irq_set_wake = bfin_internal_set_wake,
};
#endif

Expand Down

0 comments on commit 9ad89dc

Please sign in to comment.