From: Andrew Morton <akpm@linux-foundation.org>

drivers/mmc/core/lock.c: In function 'mmc_key_instantiate':
drivers/mmc/core/lock.c:41: error: implicit declaration of function 'key_payload_reserve'
drivers/mmc/core/lock.c: At top level:
drivers/mmc/core/lock.c:80: error: variable 'mmc_key_type' has initializer but incomplete type
drivers/mmc/core/lock.c:81: error: unknown field 'name' specified in initializer
drivers/mmc/core/lock.c:81: warning: excess elements in struct initializer
drivers/mmc/core/lock.c:81: warning: (near initialization for 'mmc_key_type')
drivers/mmc/core/lock.c:82: error: unknown field 'def_datalen' specified in initializer
drivers/mmc/core/lock.c:82: warning: excess elements in struct initializer
drivers/mmc/core/lock.c:82: warning: (near initialization for 'mmc_key_type')
drivers/mmc/core/lock.c:83: error: unknown field 'instantiate' specified in initializer
drivers/mmc/core/lock.c:83: warning: excess elements in struct initializer
drivers/mmc/core/lock.c:83: warning: (near initialization for 'mmc_key_type')
drivers/mmc/core/lock.c:84: error: unknown field 'match' specified in initializer
drivers/mmc/core/lock.c:84: warning: excess elements in struct initializer
drivers/mmc/core/lock.c:84: warning: (near initialization for 'mmc_key_type')
drivers/mmc/core/lock.c:85: error: unknown field 'destroy' specified in initializer
drivers/mmc/core/lock.c:85: warning: excess elements in struct initializer
drivers/mmc/core/lock.c:85: warning: (near initialization for 'mmc_key_type')
drivers/mmc/core/lock.c: In function 'mmc_register_key_type':
drivers/mmc/core/lock.c:90: error: implicit declaration of function 'register_key_type'
drivers/mmc/core/lock.c: In function 'mmc_unregister_key_type':
drivers/mmc/core/lock.c:95: error: implicit declaration of function 'unregister_key_type'

Whoever merges second needs this.

Cc: David Howells <dhowells@redhat.com>
Cc: Pierre Ossman <drzeus@drzeus.cx>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/mmc/core/lock.c |    1 +
 1 file changed, 1 insertion(+)

diff -puN drivers/mmc/core/lock.c~keys-make-request_key-and-co-fundamentally-asynchronous-vs-git-mmc drivers/mmc/core/lock.c
--- a/drivers/mmc/core/lock.c~keys-make-request_key-and-co-fundamentally-asynchronous-vs-git-mmc
+++ a/drivers/mmc/core/lock.c
@@ -13,6 +13,7 @@
 
 #include <linux/device.h>
 #include <linux/key.h>
+#include <linux/key-type.h>
 #include <linux/err.h>
 
 #include <linux/mmc/card.h>
_