diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:51:46 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:51:46 -0400 |
| commit | dbe1ab9514c231c9b062140a107d9dea0eabefcc (patch) | |
| tree | 0001c7143cf923fc704215f0a0e54221e9e5cbb9 /include/net/protocol.h | |
| parent | 612eff0e3715a6faff5ba1b74873b99e036c59fe (diff) | |
| parent | d588fcbe5a7ba8bba2cebf7799ab2d573717a806 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'include/net/protocol.h')
| -rw-r--r-- | include/net/protocol.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/protocol.h b/include/net/protocol.h index 6dc5970612d7..bcaee39bd2ff 100644 --- a/include/net/protocol.h +++ b/include/net/protocol.h | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #ifndef _PROTOCOL_H | 24 | #ifndef _PROTOCOL_H |
| 25 | #define _PROTOCOL_H | 25 | #define _PROTOCOL_H |
| 26 | 26 | ||
| 27 | #include <linux/config.h> | ||
| 28 | #include <linux/in6.h> | 27 | #include <linux/in6.h> |
| 29 | #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) | 28 | #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) |
| 30 | #include <linux/ipv6.h> | 29 | #include <linux/ipv6.h> |