diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 09:59:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 09:59:57 -0700 |
| commit | fefd26b3b8597a11a422d950c0d4424ff33a70ad (patch) | |
| tree | 6794a36072635e71e5b33aec47c616bafdca65c1 /net | |
| parent | 4a61f17378c2cdd9bd8f34ef8bd7422861d0c1f1 (diff) | |
| parent | 038b0a6d8d32db934bba6a24e74e76e4e327a94f (diff) | |
| download | linux-fefd26b3b8597a11a422d950c0d4424ff33a70ad.tar.gz | |
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')
| -rw-r--r-- | net/atm/lec.h | 1 | ||||
| -rw-r--r-- | net/core/fib_rules.c | 1 | ||||
| -rw-r--r-- | net/ipv6/fib6_rules.c | 1 | ||||
| -rw-r--r-- | net/ipv6/mip6.c | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/net/atm/lec.h b/net/atm/lec.h index 8ac6b73216357..877f509396968 100644 --- a/net/atm/lec.h +++ b/net/atm/lec.h @@ -7,7 +7,6 @@ #ifndef _LEC_H_ #define _LEC_H_ -#include <linux/config.h> #include <linux/atmdev.h> #include <linux/netdevice.h> #include <linux/atmlec.h> diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c index a99d87d82b7f1..6b0e63cacd933 100644 --- a/net/core/fib_rules.c +++ b/net/core/fib_rules.c @@ -8,7 +8,6 @@ * Authors: Thomas Graf <tgraf@suug.ch> */ -#include <linux/config.h> #include <linux/types.h> #include <linux/kernel.h> #include <linux/list.h> diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c index 34f5bfaddfc29..d8c1057e8b008 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 99d116caecda4..7ccdc8fc5a31c 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> |