diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2013-04-26 19:02:46 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-04-26 19:02:46 -0400 |
commit | c204ea092eead40d2ac577fc3b5c77052ec22a59 (patch) | |
tree | 4f0b77a2e008577b90daaf38059f724cf4a47531 /net/nfc | |
parent | 30cc4587659e1c9b1bfade8b2a757d91e04758ab (diff) |
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 <rdunlap@infradead.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc')
-rw-r--r-- | net/nfc/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/nfc/Kconfig b/net/nfc/Kconfig index 91b70865623f..5948b2fc72f6 100644 --- a/net/nfc/Kconfig +++ b/net/nfc/Kconfig | |||
@@ -4,6 +4,7 @@ | |||
4 | 4 | ||
5 | menuconfig NFC | 5 | menuconfig NFC |
6 | depends on NET | 6 | depends on NET |
7 | depends on RFKILL || !RFKILL | ||
7 | tristate "NFC subsystem support" | 8 | tristate "NFC subsystem support" |
8 | default n | 9 | default n |
9 | help | 10 | help |