diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-05-20 02:23:53 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-05-20 02:23:53 -0400 |
| commit | bdcddf95e82b1c4e370fc1196b1f4f50f775dab4 (patch) | |
| tree | ef2af2b3faee1f8e8287ca45d265809f56fbd0f6 /net/ieee802154/trace.c | |
| parent | 91d9f9856f91c82ac6289a0fff65dd12cfa07e34 (diff) | |
| parent | e26081808edadfd257c6c9d81014e3b25e9a6118 (diff) | |
Backmerge v4.1-rc4 into into drm-next
We picked up a silent conflict in amdkfd with drm-fixes and drm-next,
backmerge v4.1-rc5 and fix the conflicts
Signed-off-by: Dave Airlie <airlied@redhat.com>
Conflicts:
drivers/gpu/drm/drm_irq.c
Diffstat (limited to 'net/ieee802154/trace.c')
| -rw-r--r-- | net/ieee802154/trace.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/ieee802154/trace.c b/net/ieee802154/trace.c new file mode 100644 index 000000000000..95f997fad755 --- /dev/null +++ b/net/ieee802154/trace.c | |||
| @@ -0,0 +1,7 @@ | |||
| 1 | #include <linux/module.h> | ||
| 2 | |||
| 3 | #ifndef __CHECKER__ | ||
| 4 | #define CREATE_TRACE_POINTS | ||
| 5 | #include "trace.h" | ||
| 6 | |||
| 7 | #endif | ||