diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-13 21:23:44 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-13 21:23:44 -0400 |
| commit | dd4efa44ebf2a8a0e5edf60a53eadec981b4b10a (patch) | |
| tree | dd6e750c3e7228abb1f922de240b86d7d12d14bf /include/linux/netpoll.h | |
| parent | 1a04392bd6439876b1552793389cbb5be356ea54 (diff) | |
| parent | 046d20b73960b7a2474b6d5e920d54c3fd7c23fe (diff) | |
Merge branch 'master'
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 | ||