diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-06-28 16:18:51 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 12:01:28 -0700 |
| commit | 2e0baea9773e44f08fc2d6d6a7ebd03cf1712f53 (patch) | |
| tree | a5d1e09b6790630f45354487144e287424f5c46a /drivers/staging/rtl8187se | |
| parent | 5212499a7a41822496c3a62abae6fe103d308f18 (diff) | |
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')
| -rw-r--r-- | drivers/staging/rtl8187se/Makefile | 1 | ||||
| -rw-r--r-- | drivers/staging/rtl8187se/r8180_core.c | 7 | ||||
| -rw-r--r-- | drivers/staging/rtl8187se/r8180_pm.c | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8187se/r8180_pm.h | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8187se/r8185b_init.c | 2 |
5 files changed, 0 insertions, 14 deletions
diff --git a/drivers/staging/rtl8187se/Makefile b/drivers/staging/rtl8187se/Makefile index 57845989873..6663b1d4c43 100644 --- a/drivers/staging/rtl8187se/Makefile +++ b/drivers/staging/rtl8187se/Makefile @@ -15,7 +15,6 @@ EXTRA_CFLAGS += -DTX_TRACK EXTRA_CFLAGS += -DHIGH_POWER EXTRA_CFLAGS += -DSW_DIG EXTRA_CFLAGS += -DRATE_ADAPT -EXTRA_CFLAGS += -DCONFIG_RTL8180_PM #enable it for legacy power save, disable it for leisure power save EXTRA_CFLAGS += -DENABLE_LPS diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c index 225561c84f1..6afc4ef245a 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, }; diff --git a/drivers/staging/rtl8187se/r8180_pm.c b/drivers/staging/rtl8187se/r8180_pm.c index 2b3d642db77..ddc70c86cdf 100644 --- a/drivers/staging/rtl8187se/r8180_pm.c +++ b/drivers/staging/rtl8187se/r8180_pm.c @@ -9,7 +9,6 @@ Released under the terms of GPL (General Public Licence) */ -#ifdef CONFIG_RTL8180_PM #include "r8180_hw.h" @@ -89,4 +88,3 @@ int rtl8180_enable_wake (struct pci_dev *dev, u32 state, int enable) -#endif //CONFIG_RTL8180_PM diff --git a/drivers/staging/rtl8187se/r8180_pm.h b/drivers/staging/rtl8187se/r8180_pm.h index 7958b3a734d..37cf2ced9f0 100644 --- a/drivers/staging/rtl8187se/r8180_pm.h +++ b/drivers/staging/rtl8187se/r8180_pm.h @@ -10,7 +10,6 @@ */ -#ifdef CONFIG_RTL8180_PM #ifndef R8180_PM_H #define R8180_PM_H @@ -25,4 +24,3 @@ int rtl8180_enable_wake (struct pci_dev *dev, u32 state, int enable); #endif //R8180_PM_H -#endif // CONFIG_RTL8180_PM diff --git a/drivers/staging/rtl8187se/r8185b_init.c b/drivers/staging/rtl8187se/r8185b_init.c index 7ac187e3ac7..5c368f80089 100644 --- a/drivers/staging/rtl8187se/r8185b_init.c +++ b/drivers/staging/rtl8187se/r8185b_init.c @@ -30,9 +30,7 @@ Notes: #include "r8180_93cx6.h" /* Card EEPROM */ #include "r8180_wx.h" -#ifdef CONFIG_RTL8180_PM #include "r8180_pm.h" -#endif #include "ieee80211/dot11d.h" |