diff options
Diffstat (limited to 'kernel/arch/arm/mach-iop13xx')
| -rw-r--r-- | kernel/arch/arm/mach-iop13xx/include/mach/time.h | 2 | ||||
| -rw-r--r-- | kernel/arch/arm/mach-iop13xx/irq.c | 2 | ||||
| -rw-r--r-- | kernel/arch/arm/mach-iop13xx/msi.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/kernel/arch/arm/mach-iop13xx/include/mach/time.h b/kernel/arch/arm/mach-iop13xx/include/mach/time.h index 15bc9bb78..c871e6874 100644 --- a/kernel/arch/arm/mach-iop13xx/include/mach/time.h +++ b/kernel/arch/arm/mach-iop13xx/include/mach/time.h @@ -42,7 +42,7 @@ static inline unsigned long iop13xx_core_freq(void) case IOP13XX_CORE_FREQ_1200: return 1200000000; default: - printk("%s: warning unknown frequency, defaulting to 800Mhz\n", + printk("%s: warning unknown frequency, defaulting to 800MHz\n", __func__); } diff --git a/kernel/arch/arm/mach-iop13xx/irq.c b/kernel/arch/arm/mach-iop13xx/irq.c index bc739701c..623d85a4a 100644 --- a/kernel/arch/arm/mach-iop13xx/irq.c +++ b/kernel/arch/arm/mach-iop13xx/irq.c @@ -233,7 +233,7 @@ void __init iop13xx_init_irq(void) irq_set_chip(i, &iop13xx_irqchip4); irq_set_handler(i, handle_level_irq); - set_irq_flags(i, IRQF_VALID | IRQF_PROBE); + irq_clear_status_flags(i, IRQ_NOREQUEST | IRQ_NOPROBE); } iop13xx_msi_init(); diff --git a/kernel/arch/arm/mach-iop13xx/msi.c b/kernel/arch/arm/mach-iop13xx/msi.c index 9f89e76df..f6235b285 100644 --- a/kernel/arch/arm/mach-iop13xx/msi.c +++ b/kernel/arch/arm/mach-iop13xx/msi.c @@ -91,7 +91,7 @@ static void (*write_imipr[])(u32) = { write_imipr_3, }; -static void iop13xx_msi_handler(unsigned int irq, struct irq_desc *desc) +static void iop13xx_msi_handler(struct irq_desc *desc) { int i, j; unsigned long status; |