diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-10 03:16:27 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-10 03:16:27 -0500 |
| commit | 4ecd33d930591d41fe356160593a9076467b961c (patch) | |
| tree | b9051a334540bbce38db1b2b03cebb4cf1d51f73 /include/net/scm.h | |
| parent | 7d5a78cd98c3a5eb83bd6a061c5ea6ef1e9b8fcb (diff) | |
| parent | f7160c7573615ec82c691e294cf80d920b5d588d (diff) | |
Merge commit 'v2.6.28-rc4' into x86/apic
Diffstat (limited to 'include/net/scm.h')
| -rw-r--r-- | include/net/scm.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/net/scm.h b/include/net/scm.h index 06df126103ca..33e9986beb86 100644 --- a/include/net/scm.h +++ b/include/net/scm.h | |||
| @@ -14,8 +14,9 @@ | |||
| 14 | 14 | ||
| 15 | struct scm_fp_list | 15 | struct scm_fp_list |
| 16 | { | 16 | { |
| 17 | int count; | 17 | struct list_head list; |
| 18 | struct file *fp[SCM_MAX_FD]; | 18 | int count; |
| 19 | struct file *fp[SCM_MAX_FD]; | ||
| 19 | }; | 20 | }; |
| 20 | 21 | ||
| 21 | struct scm_cookie | 22 | struct scm_cookie |