From: Dirk Behme Date: Fri, 17 Nov 2006 21:45:09 +0000 (+0200) Subject: ARM: OMAP: Fix Apollon and OSK ethernet IRQ flags X-Git-Tag: v2.6.19-omap1~45 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c15a2b6bc072e567855516050e1ecc65a0d26cbc;p=linux-2.6-omap-h63xx.git ARM: OMAP: Fix Apollon and OSK ethernet IRQ flags Fix IRQ flags for Apollon and OSK (OMAP5912) board. Apollon fix from Kyungmin Park (kyungmin.park_at_samsung.com): Apollon (omap2420) use IRQF_TRIGGER_RISING which means IRQF_TRIGGER_HIGH. Signed-off-by: Dirk Behme Signed-off-by: Tony Lindgren --- diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h index 7977b7c4cc3..19c5275a65b 100644 --- a/drivers/net/smc91x.h +++ b/drivers/net/smc91x.h @@ -193,10 +193,12 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg) #include #ifdef CONFIG_ARCH_OMAP1 -#define SMC_IRQ_FLAGS (machine_is_omap_innovator() ? IRQF_TRIGGER_RISING : \ - IRQF_TRIGGER_FALLING) +#define SMC_IRQ_FLAGS ((machine_is_omap_innovator() || \ + machine_is_omap_osk()) \ + ? IRQF_TRIGGER_RISING : IRQF_TRIGGER_FALLING) #else -#define SMC_IRQ_FLAGS IRQF_TRIGGER_LOW +#define SMC_IRQ_FLAGS (machine_is_omap_apollon() \ + ? IRQF_TRIGGER_HIGH : IRQF_TRIGGER_LOW) #endif #elif defined(CONFIG_SH_SH4202_MICRODEV)