From 31ee03c7abece674ca3fe94df66e37f8c12524a9 Mon Sep 17 00:00:00 2001
From: Eric Miao <eric.miao@marvell.com>
Date: Fri, 6 Jun 2008 17:13:02 +0800
Subject: [PATCH] --- yaml --- r: 105171 b: refs/heads/master c:
 d280eadc4fba0bf99fb1c3b60e8c5e007f7da02c h: refs/heads/master i:   105169:
 f2dc7be667427a81980fc88723a625cb77a38394   105167:
 5bf62fee5955cb8926069462c3b74f32af3a36c0 v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/sh/boards/renesas/migor/setup.c | 3 +--
 trunk/drivers/net/smc91x.c                 | 9 +++++----
 trunk/include/linux/smc91x.h               | 1 -
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index b60e335b4a52..e4a0ed06ae8b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37d7035da5b1f184c610b038b376c0c647d8d72b
+refs/heads/master: d280eadc4fba0bf99fb1c3b60e8c5e007f7da02c
diff --git a/trunk/arch/sh/boards/renesas/migor/setup.c b/trunk/arch/sh/boards/renesas/migor/setup.c
index 01af44245b57..963c99322095 100644
--- a/trunk/arch/sh/boards/renesas/migor/setup.c
+++ b/trunk/arch/sh/boards/renesas/migor/setup.c
@@ -30,7 +30,6 @@
 
 static struct smc91x_platdata smc91x_info = {
 	.flags = SMC91X_USE_16BIT,
-	.irq_flags = IRQF_TRIGGER_HIGH,
 };
 
 static struct resource smc91x_eth_resources[] = {
@@ -42,7 +41,7 @@ static struct resource smc91x_eth_resources[] = {
 	},
 	[1] = {
 		.start  = 32, /* IRQ0 */
-		.flags  = IORESOURCE_IRQ,
+		.flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
 	},
 };
 
diff --git a/trunk/drivers/net/smc91x.c b/trunk/drivers/net/smc91x.c
index f2051b209da2..e4a6c361995a 100644
--- a/trunk/drivers/net/smc91x.c
+++ b/trunk/drivers/net/smc91x.c
@@ -2123,6 +2123,7 @@ static int smc_drv_probe(struct platform_device *pdev)
 	struct net_device *ndev;
 	struct resource *res, *ires;
 	unsigned int __iomem *addr;
+	unsigned long irq_flags = SMC_IRQ_FLAGS;
 	int ret;
 
 	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "smc91x-regs");
@@ -2152,7 +2153,6 @@ static int smc_drv_probe(struct platform_device *pdev)
 	 */
 
 	lp = netdev_priv(ndev);
-	lp->cfg.irq_flags = SMC_IRQ_FLAGS;
 
 #ifdef SMC_DYNAMIC_BUS_CONFIG
 	if (pd)
@@ -2177,8 +2177,9 @@ static int smc_drv_probe(struct platform_device *pdev)
 	}
 
 	ndev->irq = ires->start;
-	if (SMC_IRQ_FLAGS == -1)
-		lp->cfg.irq_flags = ires->flags & IRQF_TRIGGER_MASK;
+
+	if (ires->flags & IRQF_TRIGGER_MASK)
+		irq_flags = ires->flags & IRQF_TRIGGER_MASK;
 
 	ret = smc_request_attrib(pdev);
 	if (ret)
@@ -2205,7 +2206,7 @@ static int smc_drv_probe(struct platform_device *pdev)
 	}
 #endif
 
-	ret = smc_probe(ndev, addr, lp->cfg.irq_flags);
+	ret = smc_probe(ndev, addr, irq_flags);
 	if (ret != 0)
 		goto out_iounmap;
 
diff --git a/trunk/include/linux/smc91x.h b/trunk/include/linux/smc91x.h
index 8e0556b8781c..fc7682f04d89 100644
--- a/trunk/include/linux/smc91x.h
+++ b/trunk/include/linux/smc91x.h
@@ -7,7 +7,6 @@
 
 struct smc91x_platdata {
 	unsigned long flags;
-	unsigned long irq_flags; /* IRQF_... */
 };
 
 #endif /* __SMC91X_H__ */