From 54d0c3361b60eb4658ea6b29cbc407811bf2fb1f Mon Sep 17 00:00:00 2001
From: Peter Wu <lekensteyn@gmail.com>
Date: Tue, 17 Jul 2012 06:29:34 +0000
Subject: [PATCH] --- yaml --- r: 315477 b: refs/heads/master c:
 ed36d7b2578e4235d7c281304c14e4085f286236 h: refs/heads/master i:   315475:
 70a2b748da7a223bf4c477826a81afef8fca388f v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/net/ethernet/jme.c | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f4c97129a203..b4763e25a842 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02756ed4a79f15e4f265c1f6fbc634ce9966f153
+refs/heads/master: ed36d7b2578e4235d7c281304c14e4085f286236
diff --git a/trunk/drivers/net/ethernet/jme.c b/trunk/drivers/net/ethernet/jme.c
index 4ea6580d3ae8..c911d883c27e 100644
--- a/trunk/drivers/net/ethernet/jme.c
+++ b/trunk/drivers/net/ethernet/jme.c
@@ -2743,6 +2743,17 @@ jme_set_features(struct net_device *netdev, netdev_features_t features)
 	return 0;
 }
 
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static void jme_netpoll(struct net_device *dev)
+{
+	unsigned long flags;
+
+	local_irq_save(flags);
+	jme_intr(dev->irq, dev);
+	local_irq_restore(flags);
+}
+#endif
+
 static int
 jme_nway_reset(struct net_device *netdev)
 {
@@ -2944,6 +2955,9 @@ static const struct net_device_ops jme_netdev_ops = {
 	.ndo_tx_timeout		= jme_tx_timeout,
 	.ndo_fix_features       = jme_fix_features,
 	.ndo_set_features       = jme_set_features,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+	.ndo_poll_controller	= jme_netpoll,
+#endif
 };
 
 static int __devinit