From bzolnier@gmail.com Thu Jul 2 12:35:58 2009 From: Bartlomiej Zolnierkiewicz Date: Sun, 28 Jun 2009 16:18:51 +0200 Subject: Staging: rtl8187se: remove CONFIG_RTL8180_PM ifdefs To: "Greg Kroah-Hartman" Cc: Bartlomiej Zolnierkiewicz , linux-kernel@vger.kernel.org Message-ID: <20090628141851.8761.44640.sendpatchset@localhost.localdomain> From: Bartlomiej Zolnierkiewicz Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8187se/Makefile | 1 - drivers/staging/rtl8187se/r8180_core.c | 7 ------- drivers/staging/rtl8187se/r8180_pm.c | 2 -- drivers/staging/rtl8187se/r8180_pm.h | 2 -- drivers/staging/rtl8187se/r8185b_init.c | 2 -- 5 files changed, 14 deletions(-) --- 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 --- 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_dri .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, }; --- 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 -#endif //CONFIG_RTL8180_PM --- 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 #endif //R8180_PM_H -#endif // CONFIG_RTL8180_PM --- 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"