aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/joystick/gamecon.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-08-31 07:19:25 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-08-31 07:19:25 +0200
commit8f49a2fe8e6bccbd47555048def9cd08da220c74 (patch)
treee6ba7f2cc36b03503b6070668ee6720002111ca2 /drivers/input/joystick/gamecon.c
parent04b6ff5f25dece9b0ee244aa768b251cfe855c85 (diff)
parentf75aef392f869018f78cfedf3c320a6b3fcfda6b (diff)
downloadkernel_replicant_linux-8f49a2fe8e6bccbd47555048def9cd08da220c74.tar.gz
kernel_replicant_linux-8f49a2fe8e6bccbd47555048def9cd08da220c74.tar.bz2
kernel_replicant_linux-8f49a2fe8e6bccbd47555048def9cd08da220c74.zip
Merge 5.9-rc3 into tty-next
We need the tty/serial fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/input/joystick/gamecon.c')
-rw-r--r--drivers/input/joystick/gamecon.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/joystick/gamecon.c b/drivers/input/joystick/gamecon.c
index 88df68cc4ac6..d37645e496ff 100644
--- a/drivers/input/joystick/gamecon.c
+++ b/drivers/input/joystick/gamecon.c
@@ -885,7 +885,6 @@ static int gc_setup_pad(struct gc *gc, int idx, int pad_type)
case GC_MULTI:
input_set_capability(input_dev, EV_KEY, BTN_TRIGGER);
- /* fall through */
break;
case GC_PSX: