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/inet_sock.h | |
| parent | 612eff0e3715a6faff5ba1b74873b99e036c59fe (diff) | |
| parent | d588fcbe5a7ba8bba2cebf7799ab2d573717a806 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'include/net/inet_sock.h')
| -rw-r--r-- | include/net/inet_sock.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h index 883eb529ef8e..1f4a9a60d4cc 100644 --- a/include/net/inet_sock.h +++ b/include/net/inet_sock.h | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #ifndef _INET_SOCK_H | 16 | #ifndef _INET_SOCK_H |
| 17 | #define _INET_SOCK_H | 17 | #define _INET_SOCK_H |
| 18 | 18 | ||
| 19 | #include <linux/config.h> | ||
| 20 | 19 | ||
| 21 | #include <linux/string.h> | 20 | #include <linux/string.h> |
| 22 | #include <linux/types.h> | 21 | #include <linux/types.h> |