diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-08-08 09:33:54 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-08-08 09:33:54 +0200 |
| commit | e80ca144ea902efa7aed446780fd9fad421fd8d3 (patch) | |
| tree | d16768063807604865896699b25fabde783188c2 /drivers/sh | |
| parent | sh: Fix up fallout from cpuidle changes. (diff) | |
| parent | sh: intc: enable both edges GPIO interrupts on sh7372 (diff) | |
| download | linux-e80ca144ea902efa7aed446780fd9fad421fd8d3.tar.xz linux-e80ca144ea902efa7aed446780fd9fad421fd8d3.zip | |
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] = { !defined(CONFIG_CPU_SUBTYPE_SH7709) [IRQ_TYPE_LEVEL_HIGH] = VALID(3), #endif +#if defined(CONFIG_ARCH_SH7372) + [IRQ_TYPE_EDGE_BOTH] = VALID(4), +#endif }; static int intc_set_type(struct irq_data *data, unsigned int type) |