Hi, On Mon, Feb 21, 2011 at 6:52 PM, Colin Cross <[email protected]> wrote: > On Mon, Feb 21, 2011 at 11:06 AM, Olof Johansson <[email protected]> wrote: >> Add the 3 sdhci devices that are available on Harmony as >> platform devices. Two go to slots (one 4-lane, one 8-lane), >> and one goes to onboard wifi. >> >> Signed-off-by: Olof Johansson <[email protected]> >> --- >> arch/arm/mach-tegra/board-harmony.c | 11 +++++++++++ >> 1 files changed, 11 insertions(+), 0 deletions(-) >> >> diff --git a/arch/arm/mach-tegra/board-harmony.c >> b/arch/arm/mach-tegra/board-harmony.c >> index f6ad58b..8059c50 100644 >> --- a/arch/arm/mach-tegra/board-harmony.c >> +++ b/arch/arm/mach-tegra/board-harmony.c >> @@ -30,10 +30,14 @@ >> >> #include <mach/iomap.h> >> #include <mach/irqs.h> >> +#include <mach/pinmux-t2.h> > Why does this require including mach/pinmux-t2.h?
It was needed when the pcie data structures were brought over, and I messed up when I dropped that patch, resulting in picking it up here. My bad. >> + tegra_sdhci_device1.dev.platform_data = &sdhci_pdata1; >> + tegra_sdhci_device2.dev.platform_data = &sdhci_pdata2; >> + tegra_sdhci_device4.dev.platform_data = &sdhci_pdata4; >> + > What happened to the definitions of sdhci_pdata1-4? They were in the > previous version of this patch, but not this one. Same as above -- I messed up when dropping the pci-e patch combined with a conflict with one of the patches you pushed to for-next last night. I must have compiled the wrong version before I posted the series. -Olof -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
