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

[deliverable/linux.git] / include / linux / key.h

diff --git a/include/linux/key.h b/include/linux/key.h
index 169f05e4863ed140058674a1e5a1fcab5f06f766..a9220e75782ec821a8144a198e8630ef634dbca4 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