summaryrefslogtreecommitdiff
path: root/drivers/sh
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-08-08 16:33:54 +0900
committerPaul Mundt <lethal@linux-sh.org>2011-08-08 16:33:54 +0900
commite80ca144ea902efa7aed446780fd9fad421fd8d3 (patch)
treed16768063807604865896699b25fabde783188c2 /drivers/sh
parentc66d3fcbf306af3c0c4b6f4e0d81467f89c67702 (diff)
parent9a14a92c939aea1aaf27f5ad37b26b235acc2a65 (diff)
downloadlinux-3.10-e80ca144ea902efa7aed446780fd9fad421fd8d3.tar.gz
linux-3.10-e80ca144ea902efa7aed446780fd9fad421fd8d3.tar.bz2
linux-3.10-e80ca144ea902efa7aed446780fd9fad421fd8d3.zip
Merge branch 'common/core' into sh-latest
Diffstat (limited to 'drivers/sh')
-rw-r--r--drivers/sh/intc/chip.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/sh/intc/chip.c b/drivers/sh/intc/chip.c
index f33e2dd9793..33b2ed451e0 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)