[3/4] wimax: testing for rfkill support should also test for CONFIG_RFKILL_MODULE

Submitted by Inaky Perez-Gonzalez on Jan. 7, 2009, 7:22 p.m.

Details

Message ID ce4d7f71df1471d502e02861a7db65cbb2a5548f.1231355768.git.inaky@linux.intel.com
State Accepted
Delegated to: David Miller
Headers show

Commit Message

Inaky Perez-Gonzalez Jan. 7, 2009, 7:22 p.m.
Current WiMAX rfkill code is missing the case where rfkill is compiled
in as modules and works only when rfkill is compiled in. This is not
correct. Fixed to test for CONFIG_RFKILL or CONFIG_RKILL_MODULE.

Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com>
---
 net/wimax/op-rfkill.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Comments

David Miller Jan. 8, 2009, 7:08 p.m.
From: Inaky Perez-Gonzalez <inaky@linux.intel.com>
Date: Wed,  7 Jan 2009 11:22:21 -0800

> Current WiMAX rfkill code is missing the case where rfkill is compiled
> in as modules and works only when rfkill is compiled in. This is not
> correct. Fixed to test for CONFIG_RFKILL or CONFIG_RKILL_MODULE.
> 
> Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com>

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

Patch hide | download patch | download mbox

diff --git a/net/wimax/op-rfkill.c b/net/wimax/op-rfkill.c
index 8745bac..2b75aee 100644
--- a/net/wimax/op-rfkill.c
+++ b/net/wimax/op-rfkill.c
@@ -71,7 +71,7 @@ 
 #define D_SUBMODULE op_rfkill
 #include "debug-levels.h"
 
-#ifdef CONFIG_RFKILL
+#if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
 
 
 /**