diff options
| author | David S. Miller <davem@davemloft.net> | 2008-02-23 23:38:20 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-23 23:38:20 -0500 |
| commit | 8d3c202be23c5a915f7053ebd4e96f44700c6a62 (patch) | |
| tree | e0f017aff86d3ad0b858fe85f44e11096087ed00 /include/linux/netdevice.h | |
| parent | 1b04ab4597725f75f94942da9aa40daa7b9a4bd9 (diff) | |
| parent | 038eb0ea04b245351be34b0ae76b55eee4603989 (diff) | |
Merge branch 'master' of ../linux-2.6/
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 4ffa49dbb66f..a2f003239c85 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
| @@ -322,7 +322,7 @@ enum | |||
| 322 | NAPI_STATE_DISABLE, /* Disable pending */ | 322 | NAPI_STATE_DISABLE, /* Disable pending */ |
| 323 | }; | 323 | }; |
| 324 | 324 | ||
| 325 | extern void FASTCALL(__napi_schedule(struct napi_struct *n)); | 325 | extern void __napi_schedule(struct napi_struct *n); |
| 326 | 326 | ||
| 327 | static inline int napi_disable_pending(struct napi_struct *n) | 327 | static inline int napi_disable_pending(struct napi_struct *n) |
| 328 | { | 328 | { |