diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-08-08 03:33:54 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-08-08 03:33:54 -0400 |
| commit | e80ca144ea902efa7aed446780fd9fad421fd8d3 (patch) | |
| tree | d16768063807604865896699b25fabde783188c2 /drivers/sh | |
| parent | c66d3fcbf306af3c0c4b6f4e0d81467f89c67702 (diff) | |
| parent | 9a14a92c939aea1aaf27f5ad37b26b235acc2a65 (diff) | |
Merge branch 'common/core' into sh-latest
Diffstat (limited to 'drivers/sh')
| -rw-r--r-- | drivers/sh/intc/chip.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/sh/intc/chip.c b/drivers/sh/intc/chip.c index f33e2dd97934..33b2ed451e09 100644 --- a/drivers/sh/intc/chip.c +++ b/drivers/sh/intc/chip.c | |||
| @@ -186,6 +186,9 @@ static unsigned char intc_irq_sense_table[IRQ_TYPE_SENSE_MASK + 1] = { | |||
| 186 | !defined(CONFIG_CPU_SUBTYPE_SH7709) | 186 | !defined(CONFIG_CPU_SUBTYPE_SH7709) |
| 187 | [IRQ_TYPE_LEVEL_HIGH] = VALID(3), | 187 | [IRQ_TYPE_LEVEL_HIGH] = VALID(3), |
| 188 | #endif | 188 | #endif |
| 189 | #if defined(CONFIG_ARCH_SH7372) | ||
| 190 | [IRQ_TYPE_EDGE_BOTH] = VALID(4), | ||
| 191 | #endif | ||
| 189 | }; | 192 | }; |
| 190 | 193 | ||
| 191 | static int intc_set_type(struct irq_data *data, unsigned int type) | 194 | static int intc_set_type(struct irq_data *data, unsigned int type) |