diff --git a/[refs] b/[refs]
index 9b7819567dae..3ccd712c99ce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 944f8a1a6f5ff8b503f3544811d0aa4ac27dd2aa
+refs/heads/master: 8a14e8bf386434732eed6678120fe52acee6244a
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_ */