Merge tag 'asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / include / linux / key-type.h

diff --git a/include/linux/key-type.h b/include/linux/key-type.h
index ff9f1d3942356ffd1f16ab777cb8c7ed201b35e8..7463355a198b2326ce8c0b2aecd72baa8cd6f956 100644 (file)
--- a/include/linux/key-type.h
+++ b/include/linux/key-type.h
@@ -40,8 +40,7 @@ struct key_construction {
  */
 struct key_preparsed_payload {
        char            *description;   /* Proposed key description (or NULL) */
-       void            *type_data[2];  /* Private key-type data */
-       void            *payload[2];    /* Proposed payload */
+       union key_payload payload;      /* Proposed payload */
        const void      *data;          /* Raw data */
        size_t          datalen;        /* Raw datalen */
        size_t          quotalen;       /* Quota length for proposed payload */