diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-04-17 11:26:25 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-17 11:26:25 -0700 |
| commit | 6b0a7f84ea1fe248df96ccc4dd86e817e32ef65b (patch) | |
| tree | 0a7976054052e793da782c2b7ec34eccfbf66449 /drivers/gpu/drm/omapdrm/dss/hdmi4_core.c | |
| parent | Merge branch 's390-next' (diff) | |
| parent | Merge tag 'for-linus-5.1-2' of git://github.com/cminyard/linux-ipmi (diff) | |
| download | linux-dev-6b0a7f84ea1fe248df96ccc4dd86e817e32ef65b.tar.xz linux-dev-6b0a7f84ea1fe248df96ccc4dd86e817e32ef65b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflict resolution of af_smc.c from Stephen Rothwell.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/dss/hdmi4_core.c')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/dss/hdmi4_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c b/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c index 813ba42f2753..e384b95ad857 100644 --- a/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c +++ b/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c @@ -708,7 +708,7 @@ int hdmi4_audio_config(struct hdmi_core_data *core, struct hdmi_wp_data *wp, else acore.i2s_cfg.justification = HDMI_AUDIO_JUSTIFY_RIGHT; /* - * The I2S input word length is twice the lenght given in the IEC-60958 + * The I2S input word length is twice the length given in the IEC-60958 * status word. If the word size is greater than * 20 bits, increment by one. */ |