diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 19:54:53 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 20:01:40 (GMT) |
| commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
| tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /drivers/staging/rtl8192su/r8192U_pm.h | |
| parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
| parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) | |
| download | linux-fsl-qoriq-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.tar.xz | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/staging/rtl8192su/r8192U_pm.h')
| -rw-r--r-- | drivers/staging/rtl8192su/r8192U_pm.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/staging/rtl8192su/r8192U_pm.h b/drivers/staging/rtl8192su/r8192U_pm.h index ab025d6..d89e423 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 |