aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/rtl8187se/r8180_core.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-06-28 16:18:51 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-15 12:01:28 -0700
commit2e0baea9773e44f08fc2d6d6a7ebd03cf1712f53 (patch)
treea5d1e09b6790630f45354487144e287424f5c46a /drivers/staging/rtl8187se/r8180_core.c
parent5212499a7a41822496c3a62abae6fe103d308f18 (diff)
downloadkernel_samsung_smdk4412-2e0baea9773e44f08fc2d6d6a7ebd03cf1712f53.zip
kernel_samsung_smdk4412-2e0baea9773e44f08fc2d6d6a7ebd03cf1712f53.tar.gz
kernel_samsung_smdk4412-2e0baea9773e44f08fc2d6d6a7ebd03cf1712f53.tar.bz2
Staging: rtl8187se: remove CONFIG_RTL8180_PM ifdefs
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8187se/r8180_core.c')
-rw-r--r--drivers/staging/rtl8187se/r8180_core.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c
index 225561c..6afc4ef 100644
--- a/drivers/staging/rtl8187se/r8180_core.c
+++ b/drivers/staging/rtl8187se/r8180_core.c
@@ -74,9 +74,7 @@ double __extendsfdf2(float a) {return a;}
#include "r8180_wx.h"
#include "r8180_dm.h"
-#ifdef CONFIG_RTL8180_PM
#include "r8180_pm.h"
-#endif
#include "ieee80211/dot11d.h"
@@ -199,13 +197,8 @@ static struct pci_driver rtl8180_pci_driver = {
.id_table = rtl8180_pci_id_tbl, /* PCI_ID table */
.probe = rtl8180_pci_probe, /* probe fn */
.remove = __devexit_p(rtl8180_pci_remove),/* remove fn */
-#ifdef CONFIG_RTL8180_PM
.suspend = rtl8180_suspend, /* PM suspend fn */
.resume = rtl8180_resume, /* PM resume fn */
-#else
- .suspend = NULL, /* PM suspend fn */
- .resume = NULL, /* PM resume fn */
-#endif
.shutdown = rtl8180_shutdown,
};