diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-12-24 01:16:02 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-24 01:16:02 -0500 |
| commit | f34548cb735b7a80bbbb0bdd09ad4c2173ba92d5 (patch) | |
| tree | e53c9e39b3149221779c10595bc59fa02de4f45f /arch/mips/loongson/fuloong-2e/irq.c | |
| parent | 76382b5bdb77c29ab430e1b82ef1c604c8dd113b (diff) | |
| parent | 32b53076c31ce9159740b744d5eb5d9505312add (diff) | |
Merge branch 'sh/g3-prep' into sh/for-2.6.33
Diffstat (limited to 'arch/mips/loongson/fuloong-2e/irq.c')
| -rw-r--r-- | arch/mips/loongson/fuloong-2e/irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/loongson/fuloong-2e/irq.c b/arch/mips/loongson/fuloong-2e/irq.c index 7888cf69424a..320e9379bdd7 100644 --- a/arch/mips/loongson/fuloong-2e/irq.c +++ b/arch/mips/loongson/fuloong-2e/irq.c | |||
| @@ -47,8 +47,8 @@ static struct irqaction cascade_irqaction = { | |||
| 47 | void __init set_irq_trigger_mode(void) | 47 | void __init set_irq_trigger_mode(void) |
| 48 | { | 48 | { |
| 49 | /* most bonito irq should be level triggered */ | 49 | /* most bonito irq should be level triggered */ |
| 50 | BONITO_INTEDGE = BONITO_ICU_SYSTEMERR | BONITO_ICU_MASTERERR | | 50 | LOONGSON_INTEDGE = LOONGSON_ICU_SYSTEMERR | LOONGSON_ICU_MASTERERR | |
| 51 | BONITO_ICU_RETRYERR | BONITO_ICU_MBOXES; | 51 | LOONGSON_ICU_RETRYERR | LOONGSON_ICU_MBOXES; |
| 52 | } | 52 | } |
| 53 | 53 | ||
| 54 | void __init mach_init_irq(void) | 54 | void __init mach_init_irq(void) |