Merge branch 'master' into next

[linux-2.6-omap-h63xx.git] / include / net / scm.h

diff --git a/include/net/scm.h b/include/net/scm.h
index f160116db54a94c5cf671fd51c46222287d7c635..f45bb6eca7d4263e179a203872c56c87f765ebe5 100644 (file)
--- a/include/net/scm.h
+++ b/include/net/scm.h
@@ -14,8 +14,9 @@
 
 struct scm_fp_list
 {
-       int             count;
-       struct file     *fp[SCM_MAX_FD];
+       struct list_head        list;
+       int                     count;
+       struct file             *fp[SCM_MAX_FD];
 };
 
 struct scm_cookie