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_ */