diff options
| author | Nick Pelly <npelly@google.com> | 2008-12-04 17:37:05 -0800 |
|---|---|---|
| committer | Arve Hjønnevåg <arve@android.com> | 2010-02-08 15:35:55 -0800 |
| commit | 3431d2fb2dc6e731081e1b7203953b63fe5ad373 (patch) | |
| tree | 28760dbf6344c99d7e86ff03b914d5abd5418879 /net | |
| parent | 6adc27186cf59e8d50e96f6873002f081ee2d111 (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.
Change-Id: I62a11630521c636d54a4a02ab9037a43435925f5
Signed-off-by: Nick Pelly <npelly@google.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/rfkill/Kconfig | 5 | ||||
| -rw-r--r-- | net/rfkill/core.c | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/net/rfkill/Kconfig b/net/rfkill/Kconfig index eaf765876458..51f4baeede85 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 + # LED trigger support config RFKILL_LEDS bool diff --git a/net/rfkill/core.c b/net/rfkill/core.c index a001f7c1f711..c95475de2ceb 100644 --- a/net/rfkill/core.c +++ b/net/rfkill/core.c @@ -741,6 +741,7 @@ void rfkill_pause_polling(struct rfkill *rfkill) } EXPORT_SYMBOL(rfkill_pause_polling); +#ifdef CONFIG_RFKILL_PM void rfkill_resume_polling(struct rfkill *rfkill) { BUG_ON(!rfkill); @@ -775,14 +776,17 @@ static int rfkill_resume(struct device *dev) return 0; } +#endif static struct class rfkill_class = { .name = "rfkill", .dev_release = rfkill_release, .dev_attrs = rfkill_dev_attrs, .dev_uevent = rfkill_dev_uevent, +#ifdef CONFIG_RFKILL_PM .suspend = rfkill_suspend, .resume = rfkill_resume, +#endif }; bool rfkill_blocked(struct rfkill *rfkill) |