diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 20:59:57 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 20:59:57 +0400 |
commit | fefd26b3b8597a11a422d950c0d4424ff33a70ad (patch) | |
tree | 6794a36072635e71e5b33aec47c616bafdca65c1 /net/ipv6 | |
parent | 4a61f17378c2cdd9bd8f34ef8bd7422861d0c1f1 (diff) | |
parent | 038b0a6d8d32db934bba6a24e74e76e4e327a94f (diff) | |
download | linux-fefd26b3b8597a11a422d950c0d4424ff33a70ad.tar.xz |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/configh
* master.kernel.org:/pub/scm/linux/kernel/git/davej/configh:
Remove all inclusions of <linux/config.h>
Manually resolved trivial path conflicts due to removed files in
the sound/oss/ subdirectory.
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/fib6_rules.c | 1 | ||||
-rw-r--r-- | net/ipv6/mip6.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c index 34f5bfaddfc2..d8c1057e8b00 100644 --- a/net/ipv6/fib6_rules.c +++ b/net/ipv6/fib6_rules.c @@ -13,7 +13,6 @@ * Ville Nuorvala <vnuorval@tcs.hut.fi> */ -#include <linux/config.h> #include <linux/netdevice.h> #include <net/fib_rules.h> diff --git a/net/ipv6/mip6.c b/net/ipv6/mip6.c index 99d116caecda..7ccdc8fc5a31 100644 --- a/net/ipv6/mip6.c +++ b/net/ipv6/mip6.c @@ -22,7 +22,6 @@ * Masahide NAKAMURA @USAGI */ -#include <linux/config.h> #include <linux/module.h> #include <linux/skbuff.h> #include <linux/time.h> |