diff options
author | Anton Altaparmakov <aia21@cantab.net> | 2005-10-17 10:00:34 -0400 |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2005-10-17 10:00:34 -0400 |
commit | 7946ada30bc45546cefc85809ba0fd07879eff52 (patch) | |
tree | 03c382e8e4f9b81f151be953de3b7f61411c9303 /include/linux/netpoll.h | |
parent | 98b270362bb9ea6629732e7f5b65b8a6ce4743c7 (diff) | |
parent | 3d80636a0d5f056ffc26472d05b6027a7a9f6e1c (diff) |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'include/linux/netpoll.h')
-rw-r--r-- | include/linux/netpoll.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h index 5ade54a78dbb..ca5a8733000f 100644 --- a/include/linux/netpoll.h +++ b/include/linux/netpoll.h | |||
@@ -86,7 +86,7 @@ static inline void netpoll_poll_unlock(void *have) | |||
86 | 86 | ||
87 | #else | 87 | #else |
88 | #define netpoll_rx(a) 0 | 88 | #define netpoll_rx(a) 0 |
89 | #define netpoll_poll_lock(a) 0 | 89 | #define netpoll_poll_lock(a) NULL |
90 | #define netpoll_poll_unlock(a) | 90 | #define netpoll_poll_unlock(a) |
91 | #endif | 91 | #endif |
92 | 92 | ||