diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-26 20:19:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-26 20:19:41 -0700 |
| commit | 5c7c204aeca51ccfad63caab4fcdc5d8026c0fd8 (patch) | |
| tree | 4bfd5f4455b706c9ba86a8925bf367f437d16336 /include/linux/socket.h | |
| parent | 228428428138e231a155464239880201e5cc8b44 (diff) | |
| parent | 3712b42d4b1bec29a4232a6673bf2e6dcc5faa68 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6:
Add layer1 over IP support
Add mISDN HFC multiport driver
Add mISDN HFC PCI driver
Add mISDN DSP
Add mISDN core files
Define AF_ISDN and PF_ISDN
Add mISDN driver
Diffstat (limited to 'include/linux/socket.h')
| -rw-r--r-- | include/linux/socket.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/socket.h b/include/linux/socket.h index 950af631e7f..dc5086fe773 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -189,7 +189,8 @@ struct ucred { #define AF_BLUETOOTH 31 /* Bluetooth sockets */ #define AF_IUCV 32 /* IUCV sockets */ #define AF_RXRPC 33 /* RxRPC sockets */ -#define AF_MAX 34 /* For now.. */ +#define AF_ISDN 34 /* mISDN sockets */ +#define AF_MAX 35 /* For now.. */ /* Protocol families, same as address families. */ #define PF_UNSPEC AF_UNSPEC @@ -225,6 +226,7 @@ struct ucred { #define PF_BLUETOOTH AF_BLUETOOTH #define PF_IUCV AF_IUCV #define PF_RXRPC AF_RXRPC +#define PF_ISDN AF_ISDN #define PF_MAX AF_MAX /* Maximum queue length specifiable by listen. */ |