msm: usb: Fix compilation for multi-target binary
Rename some USB devices to fix concurrent compilation for
8960 and 8064.
Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>
diff --git a/arch/arm/mach-msm/board-apq8064.c b/arch/arm/mach-msm/board-apq8064.c
index 1056cbb..6b5eee6 100644
--- a/arch/arm/mach-msm/board-apq8064.c
+++ b/arch/arm/mach-msm/board-apq8064.c
@@ -76,8 +76,6 @@
&apq8064_device_qup_spi_gsbi5,
&apq8064_device_ssbi_pmic1,
&apq8064_device_ssbi_pmic2,
- &msm_device_otg,
- &msm_device_gadget_peripheral,
};
static struct msm_spi_platform_data apq8064_qup_spi_gsbi5_pdata = {
@@ -118,8 +116,8 @@
&apq8064_ssbi_pm8921_pdata;
apq8064_device_ssbi_pmic2.dev.platform_data =
&apq8064_ssbi_pm8821_pdata;
- msm_device_otg.dev.platform_data = &msm_otg_pdata;
- msm_device_gadget_peripheral.dev.parent = &msm_device_otg.dev;
+ apq8064_device_otg.dev.platform_data = &msm_otg_pdata;
+ apq8064_device_gadget_peripheral.dev.parent = &apq8064_device_otg.dev;
platform_add_devices(common_devices, ARRAY_SIZE(common_devices));
}