From: Tony Lindgren <tony@atomide.com>
Date: Wed, 28 Feb 2007 12:27:19 +0000 (-0800)
Subject: smc91x: Clean up omap machine type handling
X-Git-Tag: v2.6.22-omap1~36^2~13
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2eacc40a98b6df2ca25bb519f6f5807b42cc8761;p=linux-2.6-omap-h63xx.git

smc91x: Clean up omap machine type handling

Level handling is different for omap1 and omap2.

Signed-off-by: Tony Lindgren <tony@atomide.com>
---

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 <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)