From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Thu, 16 Dec 2010 17:17:48 +0000 (-0800)
Subject: Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input... 
X-Git-Tag: firefly_0821_release~176^2~541^2~479^2~7
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=67b989a0c17e34a7c2c095e58a2f3d1b4408e3cb;p=firefly-linux-kernel-4.4.55.git

Merge branch 'next' of git://git./linux/kernel/git/rydberg/input-mt into next

Conflicts:
	drivers/input/Makefile
---

67b989a0c17e34a7c2c095e58a2f3d1b4408e3cb
diff --cc drivers/input/Makefile
index 9fd1cf2b705e,569938b3cc04..09614ce74961
--- a/drivers/input/Makefile
+++ b/drivers/input/Makefile
@@@ -5,7 -5,7 +5,7 @@@
  # Each configuration option enables a list of files.
  
  obj-$(CONFIG_INPUT)		+= input-core.o
- input-core-y := input.o input-compat.o ff-core.o
 -input-core-objs := input.o input-compat.o ff-core.o input-mt.o
++input-core-y := input.o input-compat.o input-mt.o ff-core.o
  
  obj-$(CONFIG_INPUT_FF_MEMLESS)	+= ff-memless.o
  obj-$(CONFIG_INPUT_POLLDEV)	+= input-polldev.o
diff --cc drivers/input/input.c
index c7a1e826c580,37708d1d86ec..3312e20016bf
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@@ -10,11 -10,9 +10,11 @@@
   * the Free Software Foundation.
   */
  
 +#define pr_fmt(fmt) KBUILD_BASENAME ": " fmt
 +
  #include <linux/init.h>
  #include <linux/types.h>
- #include <linux/input.h>
+ #include <linux/input/mt.h>
  #include <linux/module.h>
  #include <linux/slab.h>
  #include <linux/random.h>