linux-next: manual merge of the input tree with the rr tree

[Stephen Rothwell]

Hi Dmitry,

Today's linux-next merge of the input tree got a conflict in
drivers/input/touchscreen/ucb1400_ts.c between commit 8c2e30fe02e2
("module_param: make bool parameters really bool (drivers & misc)") from
the rr tree and commit c899afedf168 ("Input: ucb1400_ts - convert to
threaded IRQ") from the input tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/input/touchscreen/ucb1400_ts.c
index 056eea9,d2b5753..0000000
--- a/drivers/input/touchscreen/ucb1400_ts.c
+++ b/drivers/input/touchscreen/ucb1400_ts.c
@@@ -25,12 -26,11 +26,11 @@@
  #include <linux/input.h>
  #include <linux/device.h>
  #include <linux/interrupt.h>
- #include <linux/suspend.h>
- #include <linux/kthread.h>
- #include <linux/freezer.h>
  #include <linux/ucb1400.h>
  
+ #define UCB1400_TS_POLL_PERIOD	10 /* ms */
+ 
 -static int adcsync;
 +static bool adcsync;
  static int ts_delay = 55; /* us */
  static int ts_delay_pressure;	/* us */

Attachment: pgp00000.pgp
Description: PGP signature