Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[~andy/linux] / include / net / nfc / nfc.h

diff --git a/include/net/nfc/nfc.h b/include/net/nfc/nfc.h
index bfbac732d8c653717571fcee5643652a69a6e5c5..f05b10682c9d9bbe0aa65579fc73bd8adf1747df 100644 (file)
--- a/include/net/nfc/nfc.h
+++ b/include/net/nfc/nfc.h
@@ -90,7 +90,7 @@ struct nfc_target {
 };
 
 struct nfc_genl_data {
-       u32 poll_req_pid;
+       u32 poll_req_portid;
        struct mutex genl_data_mutex;
 };