revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

[firefly-linux-kernel-4.4.55.git] / net / rfkill / core.c

diff --git a/net/rfkill/core.c b/net/rfkill/core.c
index 56b50e7db72d87618fd0193a1200ece4f61ae2ab..51875a0c5d48c489899e1bcb71c3fd2a2fd3c91c 100644 (file)
--- a/net/rfkill/core.c
+++ b/net/rfkill/core.c
@@ -783,7 +783,6 @@ 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);
@@ -818,17 +817,14 @@ 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)