From 5b6bc56cffff3cb229646b544f615dea4f0f10b7 Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
Date: Wed, 26 Sep 2012 13:39:10 -0400
Subject: [PATCH] --- yaml --- r: 328319 b: refs/heads/master c:
 7d777c3d95a18ae42473c63104d87ad080885094 h: refs/heads/master i:   328317:
 564b37fba1149c352a1c8dc332fa13f2450306cf   328315:
 b03017e90e8155aaa10046806d02d081596f9f30   328311:
 6fcdc83060210624c0d65db00f6d0febddb297c4   328303:
 c2fa61c5039f1eb1ee7e2a407b0bf4be579c0d83   328287:
 7dd28ac8362282012e4e31372d7e26dc7a6f0bf1   328255:
 277433a17904a5c1b1b0d29c29798e8182e57a82   328191:
 ac852d27170ed6603614b48034e0bae0e5f1865c v: v3

---
 [refs]                  | 2 +-
 trunk/net/nfc/hci/llc.h | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c07b06d3089c..2166b5b9d4c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4463523bef98ff827a89cf8219db7dfac4350241
+refs/heads/master: 7d777c3d95a18ae42473c63104d87ad080885094
diff --git a/trunk/net/nfc/hci/llc.h b/trunk/net/nfc/hci/llc.h
index c7014fdfc8c9..7be0b7f3ceb6 100644
--- a/trunk/net/nfc/hci/llc.h
+++ b/trunk/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_ */