diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 12:59:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 12:59:57 -0400 |
| commit | fefd26b3b8597a11a422d950c0d4424ff33a70ad (patch) | |
| tree | 6794a36072635e71e5b33aec47c616bafdca65c1 /net | |
| parent | 4a61f17378c2cdd9bd8f34ef8bd7422861d0c1f1 (diff) | |
| parent | 038b0a6d8d32db934bba6a24e74e76e4e327a94f (diff) | |
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 8ac6b7321635..877f50939696 100644 --- a/net/atm/lec.h +++ b/net/atm/lec.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #ifndef _LEC_H_ | 7 | #ifndef _LEC_H_ |
| 8 | #define _LEC_H_ | 8 | #define _LEC_H_ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <linux/atmdev.h> | 10 | #include <linux/atmdev.h> |
| 12 | #include <linux/netdevice.h> | 11 | #include <linux/netdevice.h> |
| 13 | #include <linux/atmlec.h> | 12 | #include <linux/atmlec.h> |
diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c index a99d87d82b7f..6b0e63cacd93 100644 --- a/net/core/fib_rules.c +++ b/net/core/fib_rules.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Authors: Thomas Graf <tgraf@suug.ch> | 8 | * Authors: Thomas Graf <tgraf@suug.ch> |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/types.h> | 11 | #include <linux/types.h> |
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/list.h> | 13 | #include <linux/list.h> |
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 @@ | |||
| 13 | * Ville Nuorvala <vnuorval@tcs.hut.fi> | 13 | * Ville Nuorvala <vnuorval@tcs.hut.fi> |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/netdevice.h> | 16 | #include <linux/netdevice.h> |
| 18 | 17 | ||
| 19 | #include <net/fib_rules.h> | 18 | #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 @@ | |||
| 22 | * Masahide NAKAMURA @USAGI | 22 | * Masahide NAKAMURA @USAGI |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/config.h> | ||
| 26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 27 | #include <linux/skbuff.h> | 26 | #include <linux/skbuff.h> |
| 28 | #include <linux/time.h> | 27 | #include <linux/time.h> |