From a7cd80507e235092bad11b6163d8775b646e2af6 Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
Date: Tue, 10 Aug 2010 16:24:41 -0700
Subject: [PATCH] --- yaml --- r: 209217 b: refs/heads/master c:
 969a6e521730153380ad7781095f503c040b684c h: refs/heads/master i:   209215:
 7a918aeb8bac96362843a6f6a9573c10468e9ed2 v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/netpoll.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 23890fb5c132..476dafb12d0b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c114f42a597346de793a1d166478266a7ec3b61
+refs/heads/master: 969a6e521730153380ad7781095f503c040b684c
diff --git a/trunk/include/linux/netpoll.h b/trunk/include/linux/netpoll.h
index 413742c92d14..791d5109f34c 100644
--- a/trunk/include/linux/netpoll.h
+++ b/trunk/include/linux/netpoll.h
@@ -122,7 +122,7 @@ static inline int netpoll_tx_running(struct net_device *dev)
 }
 
 #else
-static inline int netpoll_rx(struct sk_buff *skb)
+static inline bool netpoll_rx(struct sk_buff *skb)
 {
 	return 0;
 }