From 3e6e0a6f19128a797facb1f0b3d1ed49008f1b14 Mon Sep 17 00:00:00 2001
From: Eric Lapuyade <eric.lapuyade@linux.intel.com>
Date: Tue, 18 Sep 2012 19:24:37 +0200
Subject: [PATCH] --- yaml --- r: 328285 b: refs/heads/master c:
 a7d0281bbf7e1b0eff2de3c7ed6a5ffce6b62dac h: refs/heads/master i:   328283:
 4d14cb72149c9fd89d5eb7f3702ba4b3cb6fafd2 v: v3

---
 [refs]                        | 2 +-
 trunk/net/nfc/hci/llc_nop.c   | 2 +-
 trunk/net/nfc/hci/llc_shdlc.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3366a04148c4..66d38e0f0675 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c51ad34e542606854d0545533329e916689599ba
+refs/heads/master: a7d0281bbf7e1b0eff2de3c7ed6a5ffce6b62dac
diff --git a/trunk/net/nfc/hci/llc_nop.c b/trunk/net/nfc/hci/llc_nop.c
index d91dd66a082d..87b10291b40f 100644
--- a/trunk/net/nfc/hci/llc_nop.c
+++ b/trunk/net/nfc/hci/llc_nop.c
@@ -93,7 +93,7 @@ static struct nfc_llc_ops llc_nop_ops = {
 	.xmit_from_hci = llc_nop_xmit_from_hci,
 };
 
-int nfc_llc_nop_register()
+int nfc_llc_nop_register(void)
 {
 	return nfc_llc_register(LLC_NOP_NAME, &llc_nop_ops);
 }
diff --git a/trunk/net/nfc/hci/llc_shdlc.c b/trunk/net/nfc/hci/llc_shdlc.c
index 3761c7490a61..d54bfc51c693 100644
--- a/trunk/net/nfc/hci/llc_shdlc.c
+++ b/trunk/net/nfc/hci/llc_shdlc.c
@@ -826,7 +826,7 @@ static struct nfc_llc_ops llc_shdlc_ops = {
 	.xmit_from_hci = llc_shdlc_xmit_from_hci,
 };
 
-int nfc_llc_shdlc_register()
+int nfc_llc_shdlc_register(void)
 {
 	return nfc_llc_register(LLC_SHDLC_NAME, &llc_shdlc_ops);
 }