diff options
| author | Jens Axboe <axboe@kernel.dk> | 2011-10-19 08:30:42 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2011-10-19 08:30:42 -0400 |
| commit | 5c04b426f2e8b46cfc7969a35b2631063a3c646c (patch) | |
| tree | 2d27d9f5d2fe5d5e8fbc01a467ec58bcb50235c1 /drivers/sh/intc/chip.c | |
| parent | 499337bb6511e665a236a6a947f819d98ea340c6 (diff) | |
| parent | 899e3ee404961a90b828ad527573aaaac39f0ab1 (diff) | |
Merge branch 'v3.1-rc10' into for-3.2/core
Conflicts:
block/blk-core.c
include/linux/blkdev.h
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/sh/intc/chip.c')
| -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) |