diff options
Diffstat (limited to 'arch/mips/kernel/cevt-r4k.c')
-rw-r--r-- | arch/mips/kernel/cevt-r4k.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/kernel/cevt-r4k.c b/arch/mips/kernel/cevt-r4k.c index bc127e22fdab..6acaad0480af 100644 --- a/arch/mips/kernel/cevt-r4k.c +++ b/arch/mips/kernel/cevt-r4k.c | |||
@@ -11,10 +11,10 @@ | |||
11 | #include <linux/percpu.h> | 11 | #include <linux/percpu.h> |
12 | #include <linux/smp.h> | 12 | #include <linux/smp.h> |
13 | #include <linux/irq.h> | 13 | #include <linux/irq.h> |
14 | #include <linux/irqchip/mips-gic.h> | ||
14 | 15 | ||
15 | #include <asm/time.h> | 16 | #include <asm/time.h> |
16 | #include <asm/cevt-r4k.h> | 17 | #include <asm/cevt-r4k.h> |
17 | #include <asm/gic.h> | ||
18 | 18 | ||
19 | static int mips_next_event(unsigned long delta, | 19 | static int mips_next_event(unsigned long delta, |
20 | struct clock_event_device *evt) | 20 | struct clock_event_device *evt) |
@@ -85,8 +85,8 @@ void mips_event_handler(struct clock_event_device *dev) | |||
85 | */ | 85 | */ |
86 | static int c0_compare_int_pending(void) | 86 | static int c0_compare_int_pending(void) |
87 | { | 87 | { |
88 | #ifdef CONFIG_IRQ_GIC | 88 | #ifdef CONFIG_MIPS_GIC |
89 | if (cpu_has_veic) | 89 | if (gic_present) |
90 | return gic_get_timer_pending(); | 90 | return gic_get_timer_pending(); |
91 | #endif | 91 | #endif |
92 | return (read_c0_cause() >> cp0_compare_irq_shift) & (1ul << CAUSEB_IP); | 92 | return (read_c0_cause() >> cp0_compare_irq_shift) & (1ul << CAUSEB_IP); |