diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-01-28 10:13:52 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-01-28 10:13:52 +0300 |
| commit | fdddcfd9c93c6db006004fa5ba7fd9380e721c3f (patch) | |
| tree | 4d029f3bd29be07eac87bcfad3bd7e3012fb9428 /include/linux/mfd/tmio.h | |
| parent | f9f7bb9e0a0ca33f65a3deae9ec5e07266908fc5 (diff) | |
| parent | f17b5f06cb92ef2250513a1e154c47b78df07d40 (diff) | |
| download | linux-fdddcfd9c93c6db006004fa5ba7fd9380e721c3f.tar.xz | |
Merge 5.0-rc4 into char-misc-next
We need the char-misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/mfd/tmio.h')
| -rw-r--r-- | include/linux/mfd/tmio.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h index e2687a30e5a1..739b7bf37eaa 100644 --- a/include/linux/mfd/tmio.h +++ b/include/linux/mfd/tmio.h @@ -79,7 +79,7 @@ /* Some controllers have a CBSY bit */ #define TMIO_MMC_HAVE_CBSY BIT(11) -/* Some controllers that support HS400 use use 4 taps while others use 8. */ +/* Some controllers that support HS400 use 4 taps while others use 8. */ #define TMIO_MMC_HAVE_4TAP_HS400 BIT(13) int tmio_core_mmc_enable(void __iomem *cnf, int shift, unsigned long base); |