diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-05-29 10:05:05 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-05-29 10:05:05 -0400 |
| commit | 6715930654e06c4d2e66e718ea159079f71838f4 (patch) | |
| tree | 6a0a19fb62f3e99cb5f6bf6c34ae541f7c30fb42 /include/linux/atm_tcp.h | |
| parent | ea3f01f8afd3bc5daff915cc4ea5cc5ea9e7d427 (diff) | |
| parent | e490517a039a99d692cb3a5561941b0a5f576172 (diff) | |
Merge commit 'linus/master' into sched-fixes-for-linus
Diffstat (limited to 'include/linux/atm_tcp.h')
| -rw-r--r-- | include/linux/atm_tcp.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/include/linux/atm_tcp.h b/include/linux/atm_tcp.h index 18787f9b2f19..375638f8554b 100644 --- a/include/linux/atm_tcp.h +++ b/include/linux/atm_tcp.h | |||
| @@ -8,11 +8,9 @@ | |||
| 8 | #define LINUX_ATM_TCP_H | 8 | #define LINUX_ATM_TCP_H |
| 9 | 9 | ||
| 10 | #include <linux/atmapi.h> | 10 | #include <linux/atmapi.h> |
| 11 | 11 | #include <linux/atm.h> | |
| 12 | #ifdef __KERNEL__ | ||
| 13 | #include <linux/types.h> | ||
| 14 | #endif | ||
| 15 | #include <linux/atmioc.h> | 12 | #include <linux/atmioc.h> |
| 13 | #include <linux/types.h> | ||
| 16 | 14 | ||
| 17 | 15 | ||
| 18 | /* | 16 | /* |
| @@ -20,9 +18,9 @@ | |||
| 20 | */ | 18 | */ |
| 21 | 19 | ||
| 22 | struct atmtcp_hdr { | 20 | struct atmtcp_hdr { |
| 23 | uint16_t vpi; | 21 | __u16 vpi; |
| 24 | uint16_t vci; | 22 | __u16 vci; |
| 25 | uint32_t length; /* ... of data part */ | 23 | __u32 length; /* ... of data part */ |
| 26 | }; | 24 | }; |
| 27 | 25 | ||
| 28 | /* | 26 | /* |