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/vt6655/dpc.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/vt6655/dpc.h')
| -rw-r--r-- | drivers/staging/vt6655/dpc.h | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/drivers/staging/vt6655/dpc.h b/drivers/staging/vt6655/dpc.h index 68447c44dc2f..51508b9087ea 100644 --- a/drivers/staging/vt6655/dpc.h +++ b/drivers/staging/vt6655/dpc.h @@ -16,7 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * File: whdr.h + * File: dpc.h * * Purpose: * @@ -26,20 +26,12 @@ * */ - #ifndef __DPC_H__ #define __DPC_H__ -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif -#if !defined(__DEVICE_H__) #include "device.h" -#endif -#if !defined(__WCMD_H__) #include "wcmd.h" -#endif - /*--------------------- Export Definitions -------------------------*/ @@ -49,26 +41,14 @@ /*--------------------- Export Functions --------------------------*/ - -#ifdef __cplusplus -extern "C" { /* Assume C declarations for C++ */ -#endif /* __cplusplus */ - - BOOL device_receive_frame ( IN PSDevice pDevice, IN PSRxDesc pCurrRD ); - -#ifdef __cplusplus -} /* End of extern "C" { */ -#endif /* __cplusplus */ - - - VOID MngWorkItem(PVOID Context); + #endif // __RXTX_H__ |