aboutsummaryrefslogtreecommitdiffstats
path: root/tools/bpf
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2018-04-23 16:07:15 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2018-04-23 16:07:15 -0700
commit57eb13a9e8f5d45a95d64da2174528666240031d (patch)
tree71aa69d108c3050a132c1181cb9b4a9eb69ac04e /tools/bpf
parentInput: i8042 - enable MUX on Sony VAIO VGN-CS series to fix touchpad (diff)
parentInput: atmel_mxt_ts - remove platform data support (diff)
downloadlinux-dev-57eb13a9e8f5d45a95d64da2174528666240031d.tar.xz
linux-dev-57eb13a9e8f5d45a95d64da2174528666240031d.zip
Merge branch 'ib-chrome-platform-input-atmel-mx-ts-platform-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform into next
Sync up with chrome-platform to bring in changes to Atmel touch controller.
Diffstat (limited to 'tools/bpf')
-rw-r--r--tools/bpf/bpftool/common.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/bpf/bpftool/common.c b/tools/bpf/bpftool/common.c
index 0b482c0070e0..465995281dcd 100644
--- a/tools/bpf/bpftool/common.c
+++ b/tools/bpf/bpftool/common.c
@@ -55,6 +55,10 @@
#include "main.h"
+#ifndef BPF_FS_MAGIC
+#define BPF_FS_MAGIC 0xcafe4a11
+#endif
+
void p_err(const char *fmt, ...)
{
va_list ap;