summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/b43
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-09-25 20:16:16 (GMT)
committerDavid S. Miller <davem@davemloft.net>2008-09-25 20:16:16 (GMT)
commitdb4148da2cc84c31419b5e3ae3115ac6e11817a1 (patch)
tree72d7d99cd7a4903e017169e0ae8e2b37027129c6 /drivers/net/wireless/b43
parentef40a685311bef053dedd833a72dffaf25669dda (diff)
parent8d09a5e1c36d0dec5728e6c8b0bb5412de09b27b (diff)
downloadlinux-fsl-qoriq-db4148da2cc84c31419b5e3ae3115ac6e11817a1.tar.xz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/b43')
-rw-r--r--drivers/net/wireless/b43/rfkill.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/b43/rfkill.c b/drivers/net/wireless/b43/rfkill.c
index 7b9e99a..96902da 100644
--- a/drivers/net/wireless/b43/rfkill.c
+++ b/drivers/net/wireless/b43/rfkill.c
@@ -188,6 +188,11 @@ void b43_rfkill_init(struct b43_wldev *dev)
"The built-in radio LED will not work.\n");
#endif /* CONFIG_RFKILL_INPUT */
+#if !defined(CONFIG_RFKILL_INPUT) && !defined(CONFIG_RFKILL_INPUT_MODULE)
+ b43warn(wl, "The rfkill-input subsystem is not available. "
+ "The built-in radio LED will not work.\n");
+#endif
+
err = input_register_polled_device(rfk->poll_dev);
if (err)
goto err_unreg_rfk;