---

yaml --- r: 328319 b: refs/heads/master c: 7d777c3 h: refs/heads/master i: 328317: 564b37f 328315: b03017e 328311: 6fcdc83 328303: c2fa61c 328287: 7dd28ac 328255: 277433a 328191: ac852d2 v: v3
git-mirror · Sep 27, 2012 · 5b6bc56 · 5b6bc56
1 parent b821236
commit 5b6bc56
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git 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
@@ -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_ */