diff options
| author | Randy Dunlap <randy.dunlap@oracle.com> | 2011-05-20 12:10:04 -0400 |
|---|---|---|
| committer | Randy Dunlap <randy.dunlap@oracle.com> | 2011-05-20 12:10:04 -0400 |
| commit | 2f3e4af471e38e0658e701973238ae4b5e50fcd6 (patch) | |
| tree | fbfc99c0d975e38ff80f4ff3239a9fc0567b8a4d /arch/mips/pmc-sierra | |
| parent | 61516587513c84ac26e68e3ab008dc6e965d0378 (diff) | |
| parent | d410fa4ef99112386de5f218dd7df7b4fca910b4 (diff) | |
Merge branch 'docs-security' into docs-move
Diffstat (limited to 'arch/mips/pmc-sierra')
| -rw-r--r-- | arch/mips/pmc-sierra/msp71xx/msp_irq_per.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_irq_per.c b/arch/mips/pmc-sierra/msp71xx/msp_irq_per.c index f9b9dcdfa9dd..98fd0099d964 100644 --- a/arch/mips/pmc-sierra/msp71xx/msp_irq_per.c +++ b/arch/mips/pmc-sierra/msp71xx/msp_irq_per.c | |||
| @@ -97,7 +97,7 @@ static int msp_per_irq_set_affinity(struct irq_data *d, | |||
| 97 | 97 | ||
| 98 | static struct irq_chip msp_per_irq_controller = { | 98 | static struct irq_chip msp_per_irq_controller = { |
| 99 | .name = "MSP_PER", | 99 | .name = "MSP_PER", |
| 100 | .irq_enable = unmask_per_irq. | 100 | .irq_enable = unmask_per_irq, |
| 101 | .irq_disable = mask_per_irq, | 101 | .irq_disable = mask_per_irq, |
| 102 | .irq_ack = msp_per_irq_ack, | 102 | .irq_ack = msp_per_irq_ack, |
| 103 | #ifdef CONFIG_SMP | 103 | #ifdef CONFIG_SMP |