diff options
| author | Dmitry Torokhov <[email protected]> | 2023-08-30 16:06:38 -0700 | 
|---|---|---|
| committer | Dmitry Torokhov <[email protected]> | 2023-08-30 16:06:38 -0700 | 
| commit | 1ac731c529cd4d6adbce134754b51ff7d822b145 (patch) | |
| tree | 143ab3f35ca5f3b69f583c84e6964b17139c2ec1 /drivers/pinctrl/renesas/pfc-shx3.c | |
| parent | 07b4c950f27bef0362dc6ad7ee713aab61d58149 (diff) | |
| parent | 54116d442e001e1b6bd482122043b1870998a1f3 (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 6.6 merge window.
Diffstat (limited to 'drivers/pinctrl/renesas/pfc-shx3.c')
| -rw-r--r-- | drivers/pinctrl/renesas/pfc-shx3.c | 4 | 
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pinctrl/renesas/pfc-shx3.c b/drivers/pinctrl/renesas/pfc-shx3.c index 96a65d83774f..e2ba5e3b9ec3 100644 --- a/drivers/pinctrl/renesas/pfc-shx3.c +++ b/drivers/pinctrl/renesas/pfc-shx3.c @@ -502,7 +502,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {  		PH1_FN, PH1_OUT, PH1_IN, 0,  		PH0_FN, PH0_OUT, PH0_IN, 0, ))  	}, -	{ }, +	{ /* sentinel */ }  };  static const struct pinmux_data_reg pinmux_data_regs[] = { @@ -538,7 +538,7 @@ static const struct pinmux_data_reg pinmux_data_regs[] = {  		0, 0, PH5_DATA, PH4_DATA,  		PH3_DATA, PH2_DATA, PH1_DATA, PH0_DATA, ))  	}, -	{ }, +	{ /* sentinel */ }  };  const struct sh_pfc_soc_info shx3_pinmux_info = {  |