diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-05-31 12:07:15 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-05-31 12:07:15 +0200 |
| commit | e37c83c06c2690157a989df40dc99a6b61c9ea15 (patch) | |
| tree | 024dfb8b2c9abeec9ca7cb0c0136c276d9aacc91 /include/trace/events/napi.h | |
| parent | ASOC: S5PV210: Enable AC97 support (diff) | |
| parent | Linux 2.6.35-rc1 (diff) | |
| download | linux-e37c83c06c2690157a989df40dc99a6b61c9ea15.tar.xz linux-e37c83c06c2690157a989df40dc99a6b61c9ea15.zip | |
Merge commit 'v2.6.35-rc1' into for-2.6.36
Diffstat (limited to 'include/trace/events/napi.h')
| -rw-r--r-- | include/trace/events/napi.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/trace/events/napi.h b/include/trace/events/napi.h index a8989c4547e7..188deca2f3c7 100644 --- a/include/trace/events/napi.h +++ b/include/trace/events/napi.h @@ -1,4 +1,7 @@ -#ifndef _TRACE_NAPI_H_ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM napi + +#if !defined(_TRACE_NAPI_H) || defined(TRACE_HEADER_MULTI_READ) #define _TRACE_NAPI_H_ #include <linux/netdevice.h> @@ -8,4 +11,7 @@ DECLARE_TRACE(napi_poll, TP_PROTO(struct napi_struct *napi), TP_ARGS(napi)); -#endif +#endif /* _TRACE_NAPI_H_ */ + +/* This part must be outside protection */ +#include <trace/define_trace.h> |