Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[safe/jmp/linux-2.6] / include / linux / key.h

diff --git a/include/linux/key.h b/include/linux/key.h
index 169f05e..a9220e7 100644 (file)
--- a/include/linux/key.h
+++ b/include/linux/key.h
@@ -160,6 +160,8 @@ struct key {
         */
        union {
                struct list_head        link;
+               unsigned long           x[2];
+               void                    *p[2];
        } type_data;
 
        /* key data