From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 26 Sep 2012 17:39:10 +0000 (-0400)
Subject: NFC: Add dummy nfc_llc_shdlc_register definition
X-Git-Tag: MMI-PSA29.97-13-9~15870^2~30^2~39^2~2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7d777c3d95a18ae42473c63104d87ad080885094;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

NFC: Add dummy nfc_llc_shdlc_register definition

This is used when CONFIG_NFC_SHDLC is disabled.

Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
---

diff --git a/net/nfc/hci/llc.h b/net/nfc/hci/llc.h
index c7014fdfc8c9..7be0b7f3ceb6 100644
--- a/net/nfc/hci/llc.h
+++ b/net/nfc/hci/llc.h
@@ -56,6 +56,14 @@ int nfc_llc_register(const char *name, struct nfc_llc_ops *ops);
 void nfc_llc_unregister(const char *name);
 
 int nfc_llc_nop_register(void);
+
+#if defined(CONFIG_NFC_SHDLC)
 int nfc_llc_shdlc_register(void);
+#else
+static inline int nfc_llc_shdlc_register(void)
+{
+	return 0;
+}
+#endif
 
 #endif /* __LOCAL_LLC_H_ */