diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-05 12:50:22 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-05 12:50:22 -0500 |
| commit | d0b093a8b5ae34ee8be1f7e0dd197fe4788fa1d5 (patch) | |
| tree | deaed4192d440b6afb7470b0c36e69d9d65dd119 /include/linux/net.h | |
| parent | 3e72b810e30cdf4655279dd767eb798ac7a8fe5e (diff) | |
| parent | 5c828713358cb9df8aa174371edcbbb62203a490 (diff) | |
Merge branch 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
ratelimit: Make suppressed output messages more useful
printk: Remove ratelimit.h from kernel.h
ratelimit: Fix/allow use in atomic contexts
ratelimit: Use per ratelimit context locking
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 529a0931711d..d7e26e30c8c2 100644 --- a/include/linux/net.h +++ b/include/linux/net.h | |||
| @@ -358,6 +358,7 @@ static const struct proto_ops name##_ops = { \ | |||
| 358 | 358 | ||
| 359 | #ifdef CONFIG_SYSCTL | 359 | #ifdef CONFIG_SYSCTL |
| 360 | #include <linux/sysctl.h> | 360 | #include <linux/sysctl.h> |
| 361 | #include <linux/ratelimit.h> | ||
| 361 | extern struct ratelimit_state net_ratelimit_state; | 362 | extern struct ratelimit_state net_ratelimit_state; |
| 362 | #endif | 363 | #endif |
| 363 | 364 | ||