Commit 7405a749 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'drivers/ocp2scp' into next/drivers 

* drivers/ocp2scp:
  drivers: bus: omap-ocp2scp: Fix compile error
parents 5ddf8bad 46ca6811

drivers/bus/omap-ocp2scp.c

+1 −1
Original line number Diff line number Diff line
@@ -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 = {