diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-07-03 16:06:11 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 12:01:37 -0700 |
| commit | b81ad777b9ee66a69dd270a451c214b7e443a0c1 (patch) | |
| tree | 00ea9fc34351cada09eadc63a1396d069de6a69b | |
| parent | 622d501862c5a237311b22f3a33e094d07626762 (diff) | |
| download | blackbird-op-linux-b81ad777b9ee66a69dd270a451c214b7e443a0c1.tar.gz blackbird-op-linux-b81ad777b9ee66a69dd270a451c214b7e443a0c1.zip | |
Staging: rtl8192su: remove CONFIG_RTL8192_PM ifdefs
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/rtl8192su/Makefile | 1 | ||||
| -rw-r--r-- | drivers/staging/rtl8192su/r8192U_core.c | 10 | ||||
| -rw-r--r-- | drivers/staging/rtl8192su/r8192U_pm.c | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8192su/r8192U_pm.h | 2 |
4 files changed, 0 insertions, 15 deletions
diff --git a/drivers/staging/rtl8192su/Makefile b/drivers/staging/rtl8192su/Makefile index d3dde357450f..b23c095ec7d5 100644 --- a/drivers/staging/rtl8192su/Makefile +++ b/drivers/staging/rtl8192su/Makefile @@ -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 \ diff --git a/drivers/staging/rtl8192su/r8192U_core.c b/drivers/staging/rtl8192su/r8192U_core.c index 62f514571332..b4dc7e80f996 100644 --- a/drivers/staging/rtl8192su/r8192U_core.c +++ b/drivers/staging/rtl8192su/r8192U_core.c @@ -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 }; diff --git a/drivers/staging/rtl8192su/r8192U_pm.c b/drivers/staging/rtl8192su/r8192U_pm.c index d095f7dff9e8..60d739b85eb7 100644 --- a/drivers/staging/rtl8192su/r8192U_pm.c +++ b/drivers/staging/rtl8192su/r8192U_pm.c @@ -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 diff --git a/drivers/staging/rtl8192su/r8192U_pm.h b/drivers/staging/rtl8192su/r8192U_pm.h index ab025d64f5e2..d89e423ea5cd 100644 --- a/drivers/staging/rtl8192su/r8192U_pm.h +++ b/drivers/staging/rtl8192su/r8192U_pm.h @@ -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 |
