summaryrefslogtreecommitdiff
path: root/net/nfc
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-09-26 13:39:10 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2012-09-27 10:48:08 +0200
commit7d777c3d95a18ae42473c63104d87ad080885094 (patch)
tree57b4f7e14cf1b054702c6b1f91fe5cd36ccdc5d7 /net/nfc
parent4463523bef98ff827a89cf8219db7dfac4350241 (diff)
downloadlinux-3.10-7d777c3d95a18ae42473c63104d87ad080885094.tar.gz
linux-3.10-7d777c3d95a18ae42473c63104d87ad080885094.tar.bz2
linux-3.10-7d777c3d95a18ae42473c63104d87ad080885094.zip
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>
Diffstat (limited to 'net/nfc')
-rw-r--r--net/nfc/hci/llc.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/net/nfc/hci/llc.h b/net/nfc/hci/llc.h
index c7014fdfc8c..7be0b7f3ceb 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_ */