Staging: rtl8187se: remove CONFIG_RTL8180_PM ifdefs
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
5212499a7a
commit
2e0baea977
@ -15,7 +15,6 @@ EXTRA_CFLAGS += -DTX_TRACK
|
|||||||
EXTRA_CFLAGS += -DHIGH_POWER
|
EXTRA_CFLAGS += -DHIGH_POWER
|
||||||
EXTRA_CFLAGS += -DSW_DIG
|
EXTRA_CFLAGS += -DSW_DIG
|
||||||
EXTRA_CFLAGS += -DRATE_ADAPT
|
EXTRA_CFLAGS += -DRATE_ADAPT
|
||||||
EXTRA_CFLAGS += -DCONFIG_RTL8180_PM
|
|
||||||
|
|
||||||
#enable it for legacy power save, disable it for leisure power save
|
#enable it for legacy power save, disable it for leisure power save
|
||||||
EXTRA_CFLAGS += -DENABLE_LPS
|
EXTRA_CFLAGS += -DENABLE_LPS
|
||||||
|
@ -74,9 +74,7 @@ double __extendsfdf2(float a) {return a;}
|
|||||||
#include "r8180_wx.h"
|
#include "r8180_wx.h"
|
||||||
#include "r8180_dm.h"
|
#include "r8180_dm.h"
|
||||||
|
|
||||||
#ifdef CONFIG_RTL8180_PM
|
|
||||||
#include "r8180_pm.h"
|
#include "r8180_pm.h"
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "ieee80211/dot11d.h"
|
#include "ieee80211/dot11d.h"
|
||||||
|
|
||||||
@ -199,13 +197,8 @@ static struct pci_driver rtl8180_pci_driver = {
|
|||||||
.id_table = rtl8180_pci_id_tbl, /* PCI_ID table */
|
.id_table = rtl8180_pci_id_tbl, /* PCI_ID table */
|
||||||
.probe = rtl8180_pci_probe, /* probe fn */
|
.probe = rtl8180_pci_probe, /* probe fn */
|
||||||
.remove = __devexit_p(rtl8180_pci_remove),/* remove fn */
|
.remove = __devexit_p(rtl8180_pci_remove),/* remove fn */
|
||||||
#ifdef CONFIG_RTL8180_PM
|
|
||||||
.suspend = rtl8180_suspend, /* PM suspend fn */
|
.suspend = rtl8180_suspend, /* PM suspend fn */
|
||||||
.resume = rtl8180_resume, /* PM resume fn */
|
.resume = rtl8180_resume, /* PM resume fn */
|
||||||
#else
|
|
||||||
.suspend = NULL, /* PM suspend fn */
|
|
||||||
.resume = NULL, /* PM resume fn */
|
|
||||||
#endif
|
|
||||||
.shutdown = rtl8180_shutdown,
|
.shutdown = rtl8180_shutdown,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -9,7 +9,6 @@
|
|||||||
Released under the terms of GPL (General Public Licence)
|
Released under the terms of GPL (General Public Licence)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifdef CONFIG_RTL8180_PM
|
|
||||||
|
|
||||||
|
|
||||||
#include "r8180_hw.h"
|
#include "r8180_hw.h"
|
||||||
@ -89,4 +88,3 @@ int rtl8180_enable_wake (struct pci_dev *dev, u32 state, int enable)
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
#endif //CONFIG_RTL8180_PM
|
|
||||||
|
@ -10,7 +10,6 @@
|
|||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifdef CONFIG_RTL8180_PM
|
|
||||||
|
|
||||||
#ifndef R8180_PM_H
|
#ifndef R8180_PM_H
|
||||||
#define 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 //R8180_PM_H
|
||||||
|
|
||||||
#endif // CONFIG_RTL8180_PM
|
|
||||||
|
@ -30,9 +30,7 @@ Notes:
|
|||||||
#include "r8180_93cx6.h" /* Card EEPROM */
|
#include "r8180_93cx6.h" /* Card EEPROM */
|
||||||
#include "r8180_wx.h"
|
#include "r8180_wx.h"
|
||||||
|
|
||||||
#ifdef CONFIG_RTL8180_PM
|
|
||||||
#include "r8180_pm.h"
|
#include "r8180_pm.h"
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "ieee80211/dot11d.h"
|
#include "ieee80211/dot11d.h"
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user