diff options
author | Frederic Weisbecker | 2009-10-18 01:09:09 +0200 |
---|---|---|
committer | Frederic Weisbecker | 2009-10-18 01:12:33 +0200 |
commit | 0f8f86c7bdd1c954fbe153af437a0d91a6c5721a (patch) | |
tree | 94a8d419a470a4f9852ca397bb9bbe48db92ff5c /drivers/staging/rtl8192su/r8192U_pm.h | |
parent | Merge branch 'linus' into tracing/hw-breakpoints (diff) | |
parent | perf tools: Move dereference after NULL test (diff) | |
download | kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.tar.gz kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.tar.xz kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.zip |
Merge commit 'perf/core' into perf/hw-breakpoint
Conflicts:
kernel/Makefile
kernel/trace/Makefile
kernel/trace/trace.h
samples/Makefile
Merge reason: We need to be uptodate with the perf events development
branch because we plan to rewrite the breakpoints API on top of
perf events.
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 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 |