diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-10-16 20:46:20 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-10-16 20:46:20 +0200 |
| commit | 5f19ca4e014f2bd4088b78f31426f0ba3b8e6a3c (patch) | |
| tree | 7357ef42d49b5ff46e1f9c7d0f873a3606b612f4 /drivers/gpio/gpio-pxa.c | |
| parent | d712d205210c494c29f33dc1d1f2ce4d7448faa9 (diff) | |
| parent | 58720809f52779dc0f08e53e54b014209d13eebb (diff) | |
| download | linux-5f19ca4e014f2bd4088b78f31426f0ba3b8e6a3c.tar.gz linux-5f19ca4e014f2bd4088b78f31426f0ba3b8e6a3c.tar.bz2 linux-5f19ca4e014f2bd4088b78f31426f0ba3b8e6a3c.zip | |
Merge 6.6-rc6 into char-misc-next
We need the char/misc fixes in here as well, to build on for other
changes.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpio/gpio-pxa.c')
| -rw-r--r-- | drivers/gpio/gpio-pxa.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c index 7e9f7a32d3ee..cae9661862fe 100644 --- a/drivers/gpio/gpio-pxa.c +++ b/drivers/gpio/gpio-pxa.c @@ -237,6 +237,7 @@ static bool pxa_gpio_has_pinctrl(void) switch (gpio_type) { case PXA3XX_GPIO: case MMP2_GPIO: + case MMP_GPIO: return false; default: |