diff mbox

NFC: Add missing RFKILL dependency for Kconfig

Message ID 1366999114-26903-1-git-send-email-marcel@holtmann.org (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Marcel Holtmann April 26, 2013, 5:58 p.m. UTC
Since the NFC subsystem gained RFKILL support, it needs to be able
to build properly with whatever option for RFKILL has been selected.

on i386:

net/built-in.o: In function `nfc_unregister_device':
(.text+0x6a36d): undefined reference to `rfkill_unregister'
net/built-in.o: In function `nfc_unregister_device':
(.text+0x6a378): undefined reference to `rfkill_destroy'
net/built-in.o: In function `nfc_register_device':
(.text+0x6a493): undefined reference to `rfkill_alloc'
net/built-in.o: In function `nfc_register_device':
(.text+0x6a4a4): undefined reference to `rfkill_register'
net/built-in.o: In function `nfc_register_device':
(.text+0x6a4b3): undefined reference to `rfkill_destroy'
net/built-in.o: In function `nfc_dev_up':
(.text+0x6a8e8): undefined reference to `rfkill_blocked'

when CONFIG_RFKILL=m but NFC is builtin.

Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
---
 net/nfc/Kconfig | 1 +
 1 file changed, 1 insertion(+)

Comments

Randy Dunlap April 26, 2013, 6:06 p.m. UTC | #1
On 04/26/13 10:58, Marcel Holtmann wrote:
> Since the NFC subsystem gained RFKILL support, it needs to be able
> to build properly with whatever option for RFKILL has been selected.
> 
> on i386:
> 
> net/built-in.o: In function `nfc_unregister_device':
> (.text+0x6a36d): undefined reference to `rfkill_unregister'
> net/built-in.o: In function `nfc_unregister_device':
> (.text+0x6a378): undefined reference to `rfkill_destroy'
> net/built-in.o: In function `nfc_register_device':
> (.text+0x6a493): undefined reference to `rfkill_alloc'
> net/built-in.o: In function `nfc_register_device':
> (.text+0x6a4a4): undefined reference to `rfkill_register'
> net/built-in.o: In function `nfc_register_device':
> (.text+0x6a4b3): undefined reference to `rfkill_destroy'
> net/built-in.o: In function `nfc_dev_up':
> (.text+0x6a8e8): undefined reference to `rfkill_blocked'
> 
> when CONFIG_RFKILL=m but NFC is builtin.
> 
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

Acked-by: Randy Dunlap <rdunlap@infradead.org>

Thanks.

> ---
>  net/nfc/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/net/nfc/Kconfig b/net/nfc/Kconfig
> index 60c3bbb..28afdb1 100644
> --- a/net/nfc/Kconfig
> +++ b/net/nfc/Kconfig
> @@ -4,6 +4,7 @@
>  
>  menuconfig NFC
>  	depends on NET
> +	depends on RFKILL || !RFKILL
>  	tristate "NFC subsystem support"
>  	default n
>  	help
>
Samuel Ortiz April 26, 2013, 11:19 p.m. UTC | #2
Hi Marcel,

On Fri, 2013-04-26 at 10:58 -0700, Marcel Holtmann wrote:
> Since the NFC subsystem gained RFKILL support, it needs to be able
> to build properly with whatever option for RFKILL has been selected.
> 
> on i386:
> 
> net/built-in.o: In function `nfc_unregister_device':
> (.text+0x6a36d): undefined reference to `rfkill_unregister'
> net/built-in.o: In function `nfc_unregister_device':
> (.text+0x6a378): undefined reference to `rfkill_destroy'
> net/built-in.o: In function `nfc_register_device':
> (.text+0x6a493): undefined reference to `rfkill_alloc'
> net/built-in.o: In function `nfc_register_device':
> (.text+0x6a4a4): undefined reference to `rfkill_register'
> net/built-in.o: In function `nfc_register_device':
> (.text+0x6a4b3): undefined reference to `rfkill_destroy'
> net/built-in.o: In function `nfc_dev_up':
> (.text+0x6a8e8): undefined reference to `rfkill_blocked'
> 
> when CONFIG_RFKILL=m but NFC is builtin.
> 
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
> ---
>  net/nfc/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
Applied to nfc-next, thanks.

Cheers,
Samuel.



--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/net/nfc/Kconfig b/net/nfc/Kconfig
index 60c3bbb..28afdb1 100644
--- a/net/nfc/Kconfig
+++ b/net/nfc/Kconfig
@@ -4,6 +4,7 @@ 
 
 menuconfig NFC
 	depends on NET
+	depends on RFKILL || !RFKILL
 	tristate "NFC subsystem support"
 	default n
 	help