From 012cf0e24ce024b56c0f389a2b7a0f393306eb52 Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben-linux@fluff.org>
Date: Wed, 12 Oct 2005 15:12:21 -0700
Subject: [PATCH] --- yaml --- r: 9841 b: refs/heads/master c:
 afb997c6163b33292d31a09d6aa5cbb03ffa5bf1 h: refs/heads/master i:   9839:
 457e794068143f27b0b3a88f5a6087fac1f7e300 v: v3

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

diff --git a/[refs] b/[refs]
index f3b6cb4f2b1b..112d81abb2f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab4060e858e36129f9319ef0fa055347ad60e1d5
+refs/heads/master: afb997c6163b33292d31a09d6aa5cbb03ffa5bf1
diff --git a/trunk/include/linux/netpoll.h b/trunk/include/linux/netpoll.h
index 5ade54a78dbb..ca5a8733000f 100644
--- a/trunk/include/linux/netpoll.h
+++ b/trunk/include/linux/netpoll.h
@@ -86,7 +86,7 @@ static inline void netpoll_poll_unlock(void *have)
 
 #else
 #define netpoll_rx(a) 0
-#define netpoll_poll_lock(a) 0
+#define netpoll_poll_lock(a) NULL
 #define netpoll_poll_unlock(a)
 #endif