diff options
| author | Nick Pelly <npelly@google.com> | 2008-12-04 17:37:05 -0800 |
|---|---|---|
| committer | Arve Hjønnevåg <arve@android.com> | 2009-04-07 16:43:26 -0700 |
| commit | 38273a9c6de42205899712ca95bdb4680c054f13 (patch) | |
| tree | ccf583ec18ef6bfb89822d19c7dd35063fdea714 /net | |
| parent | 03e39e8f663c896dac11e87d96e8cb0292520e36 (diff) | |
rfkill: Introduce CONFIG_RFKILL_PM and use instead of CONFIG_PM to power down
Some platforms do not want to power down rfkill devices on suspend.
Signed-off-by: Nick Pelly <npelly@google.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/rfkill/Kconfig | 5 | ||||
| -rw-r--r-- | net/rfkill/rfkill.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/net/rfkill/Kconfig b/net/rfkill/Kconfig index 7f807b30cfbb..4b3100420264 100644 --- a/net/rfkill/Kconfig +++ b/net/rfkill/Kconfig @@ -10,6 +10,11 @@ menuconfig RFKILL To compile this driver as a module, choose M here: the module will be called rfkill. +config RFKILL_PM + bool "Power off on suspend" + depends on RFKILL && PM + default y + config RFKILL_INPUT tristate "Input layer to RF switch connector" depends on RFKILL && INPUT diff --git a/net/rfkill/rfkill.c b/net/rfkill/rfkill.c index 3eaa39403c13..849b64884b85 100644 --- a/net/rfkill/rfkill.c +++ b/net/rfkill/rfkill.c @@ -512,7 +512,7 @@ static void rfkill_release(struct device *dev) module_put(THIS_MODULE); } -#ifdef CONFIG_PM +#ifdef CONFIG_RFKILL_PM static int rfkill_suspend(struct device *dev, pm_message_t state) { struct rfkill *rfkill = to_rfkill(dev); |