diff options
| author | Tony Lindgren <[email protected]> | 2020-09-03 11:50:37 +0300 |
|---|---|---|
| committer | Tony Lindgren <[email protected]> | 2020-09-03 11:50:37 +0300 |
| commit | 501e69b028a47e20cb0d842e267fc5aa5e5230aa (patch) | |
| tree | 72aef8f4c26adc52cbd2f1e2e1e5c6d16201d240 | |
| parent | 83bf6db020248f436309e99a6f8544d7216f6756 (diff) | |
| parent | ef4d0a80c6140146b20413559ab1d8c0807b51d0 (diff) | |
Merge branch 'omap-for-v5.10/omap1' into omap-for-v5.10/soc
| -rw-r--r-- | arch/arm/mach-omap1/include/mach/mux.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/include/mach/mux.h b/arch/arm/mach-omap1/include/mach/mux.h index adfe1f6bd0c5..3f6dc55d9898 100644 --- a/arch/arm/mach-omap1/include/mach/mux.h +++ b/arch/arm/mach-omap1/include/mach/mux.h @@ -88,7 +88,7 @@ * OMAP730/850 has a slightly different config for the pin mux. * - config regs are the OMAP7XX_IO_CONF_x regs (see omap7xx.h) regs and * not the FUNC_MUX_CTRL_x regs from hardware.h - * - for pull-up/down, only has one enable bit which is is in the same register + * - for pull-up/down, only has one enable bit which is in the same register * as mux config */ #define MUX_CFG_7XX(desc, mux_reg, mode_offset, mode, \ |