From: Marcel Holtmann Date: Fri, 26 Apr 2013 23:02:46 +0000 (+0200) Subject: NFC: Add missing RFKILL dependency for Kconfig X-Git-Tag: v3.12-rc1~804^2~21^2^2~9^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c204ea092eead40d2ac577fc3b5c77052ec22a59;p=kernel%2Fkernel-generic.git NFC: Add missing RFKILL dependency for Kconfig 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 Acked-by: Randy Dunlap Signed-off-by: Marcel Holtmann Signed-off-by: Samuel Ortiz --- diff --git a/net/nfc/Kconfig b/net/nfc/Kconfig index 91b7086..5948b2f 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