summaryrefslogtreecommitdiff
path: root/include/linux/platform_data
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2024-01-14 08:54:39 +0300
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2024-01-14 08:54:39 +0300
commite2a2501af13cfeb1f21bb628db54c49d61949a53 (patch)
tree96dcc179e49f02dc7845d17282898f2f5629ef8a /include/linux/platform_data
parentea3715941a9b7d816a1e9096ac0577900af2a69e (diff)
parent52c4e5985a730796a3fa555b83b404708b960f9d (diff)
downloadlinux-e2a2501af13cfeb1f21bb628db54c49d61949a53.tar.xz
Merge branch 'next' into for-linus
Prepare input updates for 6.8 merge window.
Diffstat (limited to 'include/linux/platform_data')
-rw-r--r--include/linux/platform_data/keypad-omap.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/platform_data/keypad-omap.h b/include/linux/platform_data/keypad-omap.h
index 3e7c64c854f4..f3f1311cdf3a 100644
--- a/include/linux/platform_data/keypad-omap.h
+++ b/include/linux/platform_data/keypad-omap.h
@@ -19,9 +19,6 @@ struct omap_kp_platform_data {
bool rep;
unsigned long delay;
bool dbounce;
- /* specific to OMAP242x*/
- unsigned int *row_gpios;
- unsigned int *col_gpios;
};
/* Group (0..3) -- when multiple keys are pressed, only the