From 3d510f35e296c31ba1dab1c07bf0578a91c31dc2 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Wed, 28 Feb 2007 04:27:19 -0800 Subject: [PATCH] smc91x: Clean up omap machine type handling Level handling is different for omap1 and omap2. Signed-off-by: Tony Lindgren --- drivers/net/smc91x.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h index f8429449dc1..3f097c04e7d 100644 --- a/drivers/net/smc91x.h +++ b/drivers/net/smc91x.h @@ -241,13 +241,14 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg) #include #include -#define SMC_IRQ_FLAGS (( \ - machine_is_omap_h2() \ - || machine_is_omap_h3() \ - || machine_is_omap_h4() \ - || (machine_is_omap_innovator() && !cpu_is_omap1510()) \ - ) ? IRQF_TRIGGER_FALLING : IRQF_TRIGGER_RISING) - +#ifdef CONFIG_ARCH_OMAP1 +#define SMC_IRQ_FLAGS ((machine_is_omap_innovator() || \ + machine_is_omap_osk()) \ + ? IRQF_TRIGGER_RISING : IRQF_TRIGGER_FALLING) +#else +#define SMC_IRQ_FLAGS (machine_is_omap_apollon() \ + ? IRQF_TRIGGER_RISING : IRQF_TRIGGER_LOW) +#endif #elif defined(CONFIG_SH_SH4202_MICRODEV) -- 2.41.1