| Message ID | 1309256215-9879-1-git-send-email-peter.ujfalusi@ti.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Tony Lindgren |
| Headers | show |
* Peter Ujfalusi <peter.ujfalusi@ti.com> [110628 03:12]: > Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> > --- > > Hello Tony, > > While rebasing my series on top of your devel-cleanup branch, > I found this compillation error. > You can pick it right away, or I can queue this within my series. > But I still waiting for Samuel's saying on the series, so it might > be faster if you just pick this, I'll rebase my series before I > send you the pull request anyways. Thanks, applying into devel-fixes. Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c index e2202dd..c2ea437 100644 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c @@ -510,7 +510,7 @@ static struct regulator_init_data omap3evm_vio = { #define OMAP3EVM_WLAN_IRQ_GPIO (149) static struct regulator_consumer_supply omap3evm_vmmc2_supply[] = { - REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1"); + REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1"), }; /* VMMC2 for driving the WL12xx module */ @@ -518,7 +518,7 @@ static struct regulator_init_data omap3evm_vmmc2 = { .constraints = { .valid_ops_mask = REGULATOR_CHANGE_STATUS, }, - .num_consumer_supplies = ARRAY_SIZE(omap3evm_vmmc2_supply);, + .num_consumer_supplies = ARRAY_SIZE(omap3evm_vmmc2_supply), .consumer_supplies = omap3evm_vmmc2_supply, };
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> --- Hello Tony, While rebasing my series on top of your devel-cleanup branch, I found this compillation error. You can pick it right away, or I can queue this within my series. But I still waiting for Samuel's saying on the series, so it might be faster if you just pick this, I'll rebase my series before I send you the pull request anyways. Regards, Peter arch/arm/mach-omap2/board-omap3evm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)