diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-03 03:15:35 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-03 03:15:35 -0500 |
| commit | b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15 (patch) | |
| tree | 99e5b423473097756353d038f922b2623f3edd2a /include/linux/phonet.h | |
| parent | 1bded710a574f20d41bc9e7fb531301db282d623 (diff) | |
| parent | fb53fde9762432d091dac209bdf4f3f850117c55 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/Kconfig
Diffstat (limited to 'include/linux/phonet.h')
| -rw-r--r-- | include/linux/phonet.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/phonet.h b/include/linux/phonet.h index 4157faa857b6..ee5e3c9e2bca 100644 --- a/include/linux/phonet.h +++ b/include/linux/phonet.h | |||
| @@ -23,6 +23,8 @@ | |||
| 23 | #ifndef LINUX_PHONET_H | 23 | #ifndef LINUX_PHONET_H |
| 24 | #define LINUX_PHONET_H | 24 | #define LINUX_PHONET_H |
| 25 | 25 | ||
| 26 | #include <linux/types.h> | ||
| 27 | |||
| 26 | /* Automatic protocol selection */ | 28 | /* Automatic protocol selection */ |
| 27 | #define PN_PROTO_TRANSPORT 0 | 29 | #define PN_PROTO_TRANSPORT 0 |
| 28 | /* Phonet datagram socket */ | 30 | /* Phonet datagram socket */ |