diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-05 18:22:26 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-05 18:22:26 -0500 |
| commit | 28b4d5cc17c20786848cdc07b7ea237a309776bb (patch) | |
| tree | bae406a4b17229dcce7c11be5073f7a67665e477 /include/linux/net.h | |
| parent | d29cecda036f251aee4947f47eea0fe9ed8cc931 (diff) | |
| parent | 96fa2b508d2d3fe040cf4ef2fffb955f0a537ea1 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/net/pcmcia/fmvj18x_cs.c
drivers/net/pcmcia/nmclan_cs.c
drivers/net/pcmcia/xirc2ps_cs.c
drivers/net/wireless/ray_cs.c
Diffstat (limited to 'include/linux/net.h')
| -rw-r--r-- | include/linux/net.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/net.h b/include/linux/net.h index 6ce87663551c..5e8083cacc8b 100644 --- a/include/linux/net.h +++ b/include/linux/net.h | |||
| @@ -280,6 +280,7 @@ extern int kernel_sock_shutdown(struct socket *sock, | |||
| 280 | 280 | ||
| 281 | #ifdef CONFIG_SYSCTL | 281 | #ifdef CONFIG_SYSCTL |
| 282 | #include <linux/sysctl.h> | 282 | #include <linux/sysctl.h> |
| 283 | #include <linux/ratelimit.h> | ||
| 283 | extern struct ratelimit_state net_ratelimit_state; | 284 | extern struct ratelimit_state net_ratelimit_state; |
| 284 | #endif | 285 | #endif |
| 285 | 286 | ||