diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-04 20:02:46 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-04 20:02:46 -0400 |
| commit | 7405a749ae14f846cc2892c36d1a9343b0264b7c (patch) | |
| tree | a2f959187acf6b8dcf878fd183c59cd277dffbab /drivers | |
| parent | 5ddf8bad8c5ff52aae512215131f0af37176f6ea (diff) | |
| parent | 46ca6811534e66e7b3967512efe8259021cd5488 (diff) | |
Merge branch 'drivers/ocp2scp' into next/drivers
* drivers/ocp2scp:
drivers: bus: omap-ocp2scp: Fix compile error
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/bus/omap-ocp2scp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bus/omap-ocp2scp.c b/drivers/bus/omap-ocp2scp.c index 9075ef8baf56..ff63560b8467 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[] = { | |||
| 67 | { .compatible = "ti,omap-ocp2scp" }, | 67 | { .compatible = "ti,omap-ocp2scp" }, |
| 68 | {} | 68 | {} |
| 69 | }; | 69 | }; |
| 70 | MODULE_DEVICE_TABLE(of, omap_usb2_id_table); | 70 | MODULE_DEVICE_TABLE(of, omap_ocp2scp_id_table); |
| 71 | #endif | 71 | #endif |
| 72 | 72 | ||
| 73 | static struct platform_driver omap_ocp2scp_driver = { | 73 | static struct platform_driver omap_ocp2scp_driver = { |