diff --git a/[refs] b/[refs]
index 10853295d43c..1900c580c4a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8fdd95ec162a8fbac7f41d6f54f90402fe3e8cb1
+refs/heads/master: c18370f5b2949d9cca519355f33690b75e1e7c8b
diff --git a/trunk/include/linux/netpoll.h b/trunk/include/linux/netpoll.h
index f3ad74af7e1f..4c77fe78ceff 100644
--- a/trunk/include/linux/netpoll.h
+++ b/trunk/include/linux/netpoll.h
@@ -116,6 +116,11 @@ static inline void netpoll_poll_unlock(void *have)
 	}
 }
 
+static inline int netpoll_tx_running(struct net_device *dev)
+{
+	return irqs_disabled();
+}
+
 #else
 static inline int netpoll_rx(struct sk_buff *skb)
 {
@@ -139,6 +144,10 @@ static inline void netpoll_poll_unlock(void *have)
 static inline void netpoll_netdev_init(struct net_device *dev)
 {
 }
+static inline int netpoll_tx_running(struct net_device *dev)
+{
+	return 0;
+}
 #endif
 
 #endif