Commit 2e0baea9 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Greg Kroah-Hartman
Browse files

Staging: rtl8187se: remove CONFIG_RTL8180_PM ifdefs 



Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5212499a

drivers/staging/rtl8187se/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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

drivers/staging/rtl8187se/r8180_core.c

+0 −7
Original line number Diff line number Diff line
@@ -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,

};

drivers/staging/rtl8187se/r8180_pm.c

+0 −2
Original line number Diff line number Diff line
@@ -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

drivers/staging/rtl8187se/r8180_pm.h

+0 −2
Original line number Diff line number Diff line
@@ -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

drivers/staging/rtl8187se/r8185b_init.c

+0 −2
Original line number Diff line number Diff line
@@ -30,9 +30,7 @@ Major Change History: 
#include "r8180_93cx6.h"   /* Card EEPROM */

#include "r8180_wx.h"



#ifdef CONFIG_RTL8180_PM

#include "r8180_pm.h"

#endif



#include "ieee80211/dot11d.h"