Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/dtor/input.git manually

Some manual fixups required due to clashes with the PF_FREEZE cleanups.

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/input/touchscreen/elo.c b/drivers/input/touchscreen/elo.c
index 546ce599334e..3cdc9cab688d 100644
--- a/drivers/input/touchscreen/elo.c
+++ b/drivers/input/touchscreen/elo.c
@@ -226,7 +226,7 @@ static int elo_connect(struct serio *serio, struct serio_driver *drv)
                         input_set_abs_params(&elo->dev, ABS_Y, 96, 4000, 0, 0);
                         input_set_abs_params(&elo->dev, ABS_PRESSURE, 0, 255, 0, 0);
                         break;
-                
+
                 case 1: /* 6-byte protocol */
                         input_set_abs_params(&elo->dev, ABS_PRESSURE, 0, 15, 0, 0);