[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20151231145329.63b42c86@canb.auug.org.au>
Date: Thu, 31 Dec 2015 14:53:29 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Ulf Hansson <ulf.hansson@...aro.org>,
Stephen Warren <swarren@...dia.com>,
Colin Cross <ccross@...roid.com>,
Olof Johansson <olof@...om.net>,
Thierry Reding <treding@...dia.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Lucas Stach <dev@...xeye.de>
Subject: linux-next: build failure after merge of the mmc-uh tree
Hi Ulf,
After merging the mmc-uh tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
drivers/mmc/host/sdhci-tegra.c:361:38: error: redefinition of 'sdhci_tegra210_pdata'
static const struct sdhci_pltfm_data sdhci_tegra210_pdata = {
^
drivers/mmc/host/sdhci-tegra.c:343:38: note: previous definition of 'sdhci_tegra210_pdata' was here
static const struct sdhci_pltfm_data sdhci_tegra210_pdata = {
^
drivers/mmc/host/sdhci-tegra.c:370:42: error: redefinition of 'soc_data_tegra210'
static const struct sdhci_tegra_soc_data soc_data_tegra210 = {
^
drivers/mmc/host/sdhci-tegra.c:354:42: note: previous definition of 'soc_data_tegra210' was here
static const struct sdhci_tegra_soc_data soc_data_tegra210 = {
^
drivers/mmc/host/sdhci-tegra.c:372:14: error: 'NVQUIRK_DISABLE_SDR50' undeclared here (not in a function)
.nvquirks = NVQUIRK_DISABLE_SDR50 |
^
drivers/mmc/host/sdhci-tegra.c:373:7: error: 'NVQUIRK_DISABLE_DDR50' undeclared here (not in a function)
NVQUIRK_DISABLE_DDR50 |
^
drivers/mmc/host/sdhci-tegra.c:374:7: error: 'NVQUIRK_DISABLE_SDR104' undeclared here (not in a function)
NVQUIRK_DISABLE_SDR104,
^
Caused by patch
"mmc: tegra: Add Tegra210 support"
turning up in two trees (mmc-uh and tegra) as separate commits and then
further changes to this file in the mmc-uh tree.
I used the version of the file from the mmc-uh tree.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists