diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-04-05 08:59:21 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-04-05 08:59:21 +0200 |
| commit | 9594408763d439287742d5582842db6a476bbd71 (patch) | |
| tree | 2a0787dae55a3372108837cc8ce3261beac6ff46 /drivers/input | |
| parent | tty: pty: Add a blank line after declarations (diff) | |
| parent | Linux 5.12-rc6 (diff) | |
| download | linux-9594408763d439287742d5582842db6a476bbd71.tar.xz linux-9594408763d439287742d5582842db6a476bbd71.zip | |
Merge 5.12-rc6 into tty-next
We need the serial/tty fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/joydev.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c index 430dc6975004..da8963a9f044 100644 --- a/drivers/input/joydev.c +++ b/drivers/input/joydev.c @@ -26,7 +26,6 @@ MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>"); MODULE_DESCRIPTION("Joystick device interfaces"); -MODULE_SUPPORTED_DEVICE("input/js"); MODULE_LICENSE("GPL"); #define JOYDEV_MINOR_BASE 0 |