diff --git a/[refs] b/[refs]
index a27db822f4f4..a40f3e99806b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c53b1b15e222244358d3cbbefd2a13920faa352
+refs/heads/master: d5ccd67bb77ced5249067d05171992a7d5020393
diff --git a/trunk/drivers/net/smc91x.c b/trunk/drivers/net/smc91x.c
index 05c91ee6921e..f12206bdbb75 100644
--- a/trunk/drivers/net/smc91x.c
+++ b/trunk/drivers/net/smc91x.c
@@ -2283,7 +2283,7 @@ static int __devinit smc_drv_probe(struct platform_device *pdev)
 
 	ndev->irq = ires->start;
 
-	if (ires->flags & IRQF_TRIGGER_MASK)
+	if (irq_flags == -1 || ires->flags & IRQF_TRIGGER_MASK)
 		irq_flags = ires->flags & IRQF_TRIGGER_MASK;
 
 	ret = smc_request_attrib(pdev, ndev);