diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-19 06:47:01 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-19 06:47:01 +0100 |
commit | 73709e1af5163ebf5e9b0e18fe90b7e843657d36 (patch) | |
tree | 91ca8b98187ba60e88f8df2e32147fdf651f159e /drivers/mmc/host/dw_mmc-exynos.c | |
parent | c26dd817d99bc50acf2667ee27c39414a7a6638e (diff) | |
parent | c698ca5278934c0ae32297a8725ced2e27585d7f (diff) | |
download | blackbird-obmc-linux-73709e1af5163ebf5e9b0e18fe90b7e843657d36.tar.gz blackbird-obmc-linux-73709e1af5163ebf5e9b0e18fe90b7e843657d36.zip |
Merge 4.16-rc6 into staging-next
We want the staging fixes in here as well to handle merge/test issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/mmc/host/dw_mmc-exynos.c')
-rw-r--r-- | drivers/mmc/host/dw_mmc-exynos.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mmc/host/dw_mmc-exynos.c b/drivers/mmc/host/dw_mmc-exynos.c index 35026795be28..fa41d9422d57 100644 --- a/drivers/mmc/host/dw_mmc-exynos.c +++ b/drivers/mmc/host/dw_mmc-exynos.c @@ -487,6 +487,7 @@ static unsigned long exynos_dwmmc_caps[4] = { static const struct dw_mci_drv_data exynos_drv_data = { .caps = exynos_dwmmc_caps, + .num_caps = ARRAY_SIZE(exynos_dwmmc_caps), .init = dw_mci_exynos_priv_init, .set_ios = dw_mci_exynos_set_ios, .parse_dt = dw_mci_exynos_parse_dt, |