From bd3c3cca2a8309e459e0e3b3729e719fa09bac1e Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
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 <tony@atomide.com>
---
 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 d2767e6584a..ab2efd48aec 100644
--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@ -192,13 +192,14 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg)
 #include <asm/mach-types.h>
 #include <asm/arch/cpu.h>
 
-#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.25.4