Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core

Fixes and improvements for perf/core:

. Overhaul the tools/ makefiles, gluing them to the top level Makefile, from
  Borislav Petkov.

. Move the UI files from tools/perf/util/ui/ to tools/perf/ui/. Also move
  the GTK+ browser to tools/perf/ui/gtk/, from Namhyung Kim.

. Only fallback to sw cycles counter on ENOENT for the hw cycles, from
  Robert Richter

. Trivial fixes from Robert Richter

. Handle the autogenerated bison/flex files better, from Namhyung and Jiri Olsa.

. Navigate jump instructions in the annotate browser, just press enter or ->,
  still needs support for a jump navigation history, i.e. to go back.

. Search string in the annotate browser: same keys as vim:
     / forward
     n next backward/forward
     ? backward

. Clarify number of events/samples in the report header, from Ashay Rane

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 1 insertions, 10 deletions

diff --git a/include/linux/input/kxtj9.h b/include/linux/input/kxtj9.h
index f6bac89537b8..d415579b56fe 100644
--- a/include/linux/input/kxtj9.h
+++ b/include/linux/input/kxtj9.h
@@ -24,6 +24,7 @@
 
 struct kxtj9_platform_data {
         unsigned int min_interval;      /* minimum poll interval (in milli-seconds) */
+        unsigned int init_interval;     /* initial poll interval (in milli-seconds) */
 
         /*
          * By default, x is axis 0, y is axis 1, z is axis 2; these can be
@@ -52,16 +53,6 @@ struct kxtj9_platform_data {
         #define KXTJ9_G_8G              (1 << 4)
         u8 g_range;
 
-        /* DATA_CTRL_REG: controls the output data rate of the part */
-        #define ODR12_5F                0
-        #define ODR25F                  1
-        #define ODR50F                  2
-        #define ODR100F                 3
-        #define ODR200F                 4
-        #define ODR400F                 5
-        #define ODR800F                 6
-        u8 data_odr_init;
-
         int (*init)(void);
         void (*exit)(void);
         int (*power_on)(void);