linux-next: build failure after merge of the mmc tree

[Stephen Rothwell]

Hi all,

After merging the mmc tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/mmc/host/davinci_mmc.c: In function 'mmc_davinci_set_ios':
drivers/mmc/host/davinci_mmc.c:696:19: error: 'mmc' redeclared as different kind of symbol
  696 |  struct mmc_host *mmc = mmc_from_priv(host);
      |                   ^~~
drivers/mmc/host/davinci_mmc.c:691:50: note: previous definition of 'mmc' was here
  691 | static void mmc_davinci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
      |                                 ~~~~~~~~~~~~~~~~~^~~

Caused by commit

  359c6349a771 ("mmc: davinci: Drop pointer to mmc_host from mmc_davinci_host")

I have used the mmc tree from next-20200924 for today.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpOXqfNIU5jz.pgp
Description: OpenPGP digital signature