diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-12 22:07:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-12 22:07:59 -0400 |
| commit | 02d31ed258434b29eb0e3a10f5ede6eecd46b6ba (patch) | |
| tree | e901ed8af00756086e2da1a5e0c52602d2b01603 /include/linux/netpoll.h | |
| parent | 1b66e9fe8523cc239b6bea8443a860f50aeb2a83 (diff) | |
| parent | 9ff5c59ce278c37bca22fbf98076d199bcaf9845 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-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 | ||