diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
| commit | f630fe2817601314b2eb7ca5ddc23c7834646731 (patch) | |
| tree | 3bfb4939b7bbc3859575ca8b58fa3f929b015941 /net/ipv4/fib_trie.c | |
| parent | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (diff) | |
| parent | 8a03d9a498eaf02c8a118752050a5154852c13bf (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'net/ipv4/fib_trie.c')
| -rw-r--r-- | net/ipv4/fib_trie.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index c33dca073801..72b3036bbc09 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c | |||
| @@ -57,7 +57,6 @@ | |||
| 57 | #include <asm/bitops.h> | 57 | #include <asm/bitops.h> |
| 58 | #include <linux/types.h> | 58 | #include <linux/types.h> |
| 59 | #include <linux/kernel.h> | 59 | #include <linux/kernel.h> |
| 60 | #include <linux/sched.h> | ||
| 61 | #include <linux/mm.h> | 60 | #include <linux/mm.h> |
| 62 | #include <linux/string.h> | 61 | #include <linux/string.h> |
| 63 | #include <linux/socket.h> | 62 | #include <linux/socket.h> |