Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Staging: rtl8192su: remove CONFIG_RTL8192_PM ifdefs 



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

drivers/staging/rtl8192su/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ EXTRA_CFLAGS += -DRTL8192SU_ASIC_VERIFICATION 
EXTRA_CFLAGS += -DRTL8192SU_USB_PHY_TEST=0



#EXTRA_CFLAGS += -DMUTIPLE_BULK_OUT

EXTRA_CFLAGS += -DCONFIG_RTL8192_PM



r8192s_usb-objs :=		\

	r8180_93cx6.o		\

drivers/staging/rtl8192su/r8192U_core.c

+0 −10
Original line number Diff line number Diff line
@@ -76,9 +76,7 @@ double __extendsfdf2(float a) {return a;} 
//#include "r8192xU_phyreg.h"

#include <linux/usb.h>



#ifdef CONFIG_RTL8192_PM

#include "r8192U_pm.h"

#endif



#include "ieee80211/dot11d.h"
@@ -97,9 +95,7 @@ double __extendsfdf2(float a) {return a;} 
//#include "r8192xU_phyreg.h"

#include <linux/usb.h>



#ifdef CONFIG_RTL8192_PM

#include "r8192U_pm.h"

#endif



#include "ieee80211/dot11d.h"
@@ -222,15 +218,9 @@ static struct usb_driver rtl8192_usb_driver = { 
	.id_table	= rtl8192_usb_id_tbl,	          /* PCI_ID table  */

	.probe		= rtl8192_usb_probe,	          /* probe fn      */

	.disconnect	= rtl8192_usb_disconnect,	  /* remove fn     */

#ifdef CONFIG_RTL8192_PM

	.suspend	= rtl8192U_suspend,	          /* PM suspend fn */

	.resume		= rtl8192U_resume,                 /* PM resume fn  */

	.reset_resume   = rtl8192U_resume,                 /* PM reset resume fn  */

#else

	.suspend	= NULL,			          /* PM suspend fn */

	.resume      	= NULL,			          /* PM resume fn  */

	.reset_resume   = NULL,                 /* PM reset resume fn  */

#endif

};

drivers/staging/rtl8192su/r8192U_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_RTL8192_PM

#include "r8192U.h"

#include "r8192U_pm.h"
@@ -71,4 +70,3 @@ int rtl8192U_enable_wake (struct pci_dev *dev, u32 state, int enable) 
	return(-EAGAIN);

}

#endif //CONFIG_RTL8192_PM

drivers/staging/rtl8192su/r8192U_pm.h

+0 −2
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 


*/



#ifdef CONFIG_RTL8192_PM



#ifndef R8192_PM_H

#define R8192_PM_H
@@ -24,4 +23,3 @@ int rtl8192U_resume (struct usb_interface *intf); 
int rtl8192U_enable_wake (struct pci_dev *dev, u32 state, int enable);



#endif //R8192U_PM_H
 
#endif // CONFIG_RTL8192_PM