From f1ea8456384086fe9565a48fa4c75d951fe28b11 Mon Sep 17 00:00:00 2001
From: Michal Simek <monstr@monstr.eu>
Date: Wed, 18 Aug 2010 01:22:49 +0000
Subject: [PATCH] --- yaml --- r: 213849 b: refs/heads/master c:
 357e8b5f723ba9e1d0a0f8ffb1361d607e43e19a h: refs/heads/master i:   213847:
 9a8c6f365f025c1b094434ed49e215dcbf84ac4c v: v3

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

diff --git a/[refs] b/[refs]
index 1b247a246f2e..65cb31de7f18 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f0bee16d0840c272229f2038a23a9a02dfc803d
+refs/heads/master: 357e8b5f723ba9e1d0a0f8ffb1361d607e43e19a
diff --git a/trunk/drivers/net/xilinx_emaclite.c b/trunk/drivers/net/xilinx_emaclite.c
index ecbbb688eba0..71122ee4e830 100644
--- a/trunk/drivers/net/xilinx_emaclite.c
+++ b/trunk/drivers/net/xilinx_emaclite.c
@@ -1269,6 +1269,16 @@ static int __devexit xemaclite_of_remove(struct platform_device *of_dev)
 	return 0;
 }
 
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static void
+xemaclite_poll_controller(struct net_device *ndev)
+{
+	disable_irq(ndev->irq);
+	xemaclite_interrupt(ndev->irq, ndev);
+	enable_irq(ndev->irq);
+}
+#endif
+
 static struct net_device_ops xemaclite_netdev_ops = {
 	.ndo_open		= xemaclite_open,
 	.ndo_stop		= xemaclite_close,
@@ -1276,6 +1286,9 @@ static struct net_device_ops xemaclite_netdev_ops = {
 	.ndo_set_mac_address	= xemaclite_set_mac_address,
 	.ndo_tx_timeout		= xemaclite_tx_timeout,
 	.ndo_get_stats		= xemaclite_get_stats,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+	.ndo_poll_controller = xemaclite_poll_controller,
+#endif
 };
 
 /* Match table for OF platform binding */