Re: inux-next: Tree for Sept 26 (nfc)

On 09/25/2012 11:44 PM, Stephen Rothwell wrote:

Hi all,

Changes since 201209025:

on x86_64:

ERROR: "nfc_llc_shdlc_register" [net/nfc/hci/hci.ko] undefined!


Full randconfig file is attached.

-- 
~Randy

From: "John W. Linville" <redacted>

This is used when CONFIG_NFC_SHDLC is disabled.

Reported-by: Randy Dunlap <redacted>
Signed-off-by: John W. Linville <redacted>
---
 net/nfc/hci/llc.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/net/nfc/hci/llc.h b/net/nfc/hci/llc.h
index c7014fd..7be0b7f 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_ */

-- 
1.7.11.4

Hi John,

On Wed, Sep 26, 2012 at 01:39:10PM -0400, John W. Linville wrote:

From: "John W. Linville" <redacted>

This is used when CONFIG_NFC_SHDLC is disabled.

Reported-by: Randy Dunlap <redacted>

Acked-by: Samuel Ortiz <redacted>

Signed-off-by: John W. Linville <redacted>
---
 net/nfc/hci/llc.h | 8 ++++++++
 1 file changed, 8 insertions(+)

Thanks a lot for fixing this one up.

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/