diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-07-08 13:39:28 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-07-08 13:39:28 -0700 |
| commit | a63f7778f76e1cf8ed3bcb7a1d9453c9609121ad (patch) | |
| tree | 9a26f3ff67dfbd542c6eca3e5c1c7f443b1647dd /drivers/input/keyboard | |
| parent | c4bcc1b99b8b8acdfe673e4701a9c2acb6b8b2fb (diff) | |
| parent | 88084a3df1672e131ddc1b4e39eeacfd39864acf (diff) | |
| download | linux-a63f7778f76e1cf8ed3bcb7a1d9453c9609121ad.tar.gz | |
Merge tag 'v5.19-rc5' into next
Merge with mainline to bring up the latest definition from MFD subsystem
needed for Mediatek keypad driver.
Diffstat (limited to 'drivers/input/keyboard')
| -rw-r--r-- | drivers/input/keyboard/omap-keypad.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c index eb3a687796e7..57447d6c9007 100644 --- a/drivers/input/keyboard/omap-keypad.c +++ b/drivers/input/keyboard/omap-keypad.c @@ -24,6 +24,7 @@ #include <linux/gpio.h> #include <linux/platform_data/gpio-omap.h> #include <linux/platform_data/keypad-omap.h> +#include <linux/soc/ti/omap1-io.h> #undef NEW_BOARD_LEARNING_MODE |