On Tue, Sep 4, 2012 at 2:47 PM, Randy Dunlap <rdunlap@xxxxxxxxxxxx> wrote: > On 09/04/2012 07:41 AM, Alan Cox wrote: > >> From: Alan Cox <alan@xxxxxxxxxxxxxxx> >> >> Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx> >> --- >> >> drivers/bus/omap-ocp2scp.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/bus/omap-ocp2scp.c b/drivers/bus/omap-ocp2scp.c >> index 9075ef8..ff63560 100644 >> --- a/drivers/bus/omap-ocp2scp.c >> +++ b/drivers/bus/omap-ocp2scp.c >> @@ -67,7 +67,7 @@ static const struct of_device_id omap_ocp2scp_id_table[] = { >> { .compatible = "ti,omap-ocp2scp" }, >> {} >> }; >> -MODULE_DEVICE_TABLE(of, omap_usb2_id_table); >> +MODULE_DEVICE_TABLE(of, omap_ocp2scp_id_table); >> #endif >> >> static struct platform_driver omap_ocp2scp_driver = { >> >> -- > > > Kishon posted a patch for this on Aug. 23: > http://marc.info/?l=linux-next&m=134574365000518&w=2 > > Who needs to merge it? I've applied the first patch to arm-soc, since that's where the breakage was introduced. Pushing out shortly. -Olof -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html