From 2184f45fb41138a578a3a6748e0dbb703c6145f5 Mon Sep 17 00:00:00 2001
From: Steve Glendinning <steve.glendinning@smsc.com>
Date: Fri, 12 Dec 2008 22:31:50 -0800
Subject: [PATCH] --- yaml --- r: 122694 b: refs/heads/master c:
 e312674ffb5281a46a3ad06604edea6426c4eb24 h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/net/smsc9420.c | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 73020fca0107..171f27b8f839 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1757ab2f0411110c0261dfb66d26faf63037c531
+refs/heads/master: e312674ffb5281a46a3ad06604edea6426c4eb24
diff --git a/trunk/drivers/net/smsc9420.c b/trunk/drivers/net/smsc9420.c
index b04bfb2f6106..80dab8bea76c 100644
--- a/trunk/drivers/net/smsc9420.c
+++ b/trunk/drivers/net/smsc9420.c
@@ -550,6 +550,15 @@ static irqreturn_t smsc9420_isr(int irq, void *dev_id)
 	return ret;
 }
 
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static void smsc9420_poll_controller(struct net_device *dev)
+{
+	disable_irq(dev->irq);
+	smsc9420_isr(0, dev);
+	enable_irq(dev->irq);
+}
+#endif /* CONFIG_NET_POLL_CONTROLLER */
+
 static void smsc9420_dmac_soft_reset(struct smsc9420_pdata *pd)
 {
 	smsc9420_reg_write(pd, BUS_MODE, BUS_MODE_SWR_);
@@ -1418,6 +1427,9 @@ static const struct net_device_ops smsc9420_netdev_ops = {
 	.ndo_set_multicast_list	= smsc9420_set_multicast_list,
 	.ndo_do_ioctl		= smsc9420_do_ioctl,
 	.ndo_validate_addr	= eth_validate_addr,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+	.ndo_poll_controller	= smsc9420_poll_controller,
+#endif /* CONFIG_NET_POLL_CONTROLLER */
 };
 
 static int __devinit