From da0b405c9db9ec70b91ce7c70497abd018765c38 Mon Sep 17 00:00:00 2001
From: Andrew Victor <andrew@sanpeople.com>
Date: Tue, 5 Dec 2006 15:33:05 +0200
Subject: [PATCH] --- yaml --- r: 43215 b: refs/heads/master c:
 51cc21045714cc9f48eb6901d95eb4e552ef2ca4 h: refs/heads/master i:   43213:
 19a56cc6df5fb51bd7cd1be1b2e4cacf3c97c7ff   43211:
 8220c9690368ebe3eedb3700f12d8b6a28af90e2   43207:
 490d7a41de3c19868eda8f9a3349240fbb51d101   43199:
 d21b72e8b4c6afee83110df6b5d227700a38d175 v: v3

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

diff --git a/[refs] b/[refs]
index 25519293abb0..08035cbc8f43 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf42553ab43e102bc98eca05523d2390a1eedde9
+refs/heads/master: 51cc21045714cc9f48eb6901d95eb4e552ef2ca4
diff --git a/trunk/drivers/net/arm/at91_ether.c b/trunk/drivers/net/arm/at91_ether.c
index 918368cdb766..f33d957adc7a 100644
--- a/trunk/drivers/net/arm/at91_ether.c
+++ b/trunk/drivers/net/arm/at91_ether.c
@@ -923,6 +923,17 @@ static irqreturn_t at91ether_interrupt(int irq, void *dev_id)
 	return IRQ_HANDLED;
 }
 
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static void at91ether_poll_controller(struct net_device *dev)
+{
+	unsigned long flags;
+
+	local_irq_save(flags);
+	at91ether_interrupt(dev->irq, dev);
+	local_irq_restore(flags);
+}
+#endif
+
 /*
  * Initialize the ethernet interface
  */
@@ -972,6 +983,9 @@ static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_add
 	dev->set_mac_address = set_mac_address;
 	dev->ethtool_ops = &at91ether_ethtool_ops;
 	dev->do_ioctl = at91ether_ioctl;
+#ifdef CONFIG_NET_POLL_CONTROLLER
+	dev->poll_controller = at91ether_poll_controller;
+#endif
 
 	SET_NETDEV_DEV(dev, &pdev->dev);