ENGR00209480-6 mx6sl_usb : fix build error

fix build error

Signed-off-by: Tony LIU <junjie.liu@freescale.com>

diff --git a/arch/arm/plat-mxc/devices/platform-fsl-usb2-wakeup.c b/arch/arm/plat-mxc/devices/platform-fsl-usb2-wakeup.c
index cc6732db0dd6df569dc5df913e4347d0e55fffe3..986b766fabdefd77d20af8f4d987e7e2f68bbd9a 100644 (file)
--- a/arch/arm/plat-mxc/devices/platform-fsl-usb2-wakeup.c
+++ b/arch/arm/plat-mxc/devices/platform-fsl-usb2-wakeup.c
@@ -25,9 +25,7 @@ const struct imx_fsl_usb2_wakeup_data imx6q_fsl_hs_wakeup_data[] __initconst = {
        imx_fsl_usb2_wakeup_data_entry_single(MX6Q, 2, HS2),
        imx_fsl_usb2_wakeup_data_entry_single(MX6Q, 3, HS3),
 };
-#endif /* ifdef CONFIG_SOC_IMX6Q */
 
-#ifdef CONFIG_SOC_IMX6SL
 const struct imx_fsl_usb2_wakeup_data imx6sl_fsl_hs_wakeup_data[] __initconst = {
        imx_fsl_usb2_wakeup_data_entry_single(MX6SL, 1, HS1),
        imx_fsl_usb2_wakeup_data_entry_single(MX6SL, 2, HS2),

diff --git a/arch/arm/plat-mxc/devices/platform-mxc-ehci.c b/arch/arm/plat-mxc/devices/platform-mxc-ehci.c
index 94fdf119a5b8f5541df4121546cceec4b50782d1..c39f6d7561c686065af77ac00912d2e6d089f63a 100644 (file)
--- a/arch/arm/plat-mxc/devices/platform-mxc-ehci.c
+++ b/arch/arm/plat-mxc/devices/platform-mxc-ehci.c
@@ -56,15 +56,13 @@ const struct imx_mxc_ehci_data imx6q_mxc_ehci_hs_data[] __initconst = {
        imx_mxc_ehci_data_entry_single(MX6Q, 2, HS2),
        imx_mxc_ehci_data_entry_single(MX6Q, 3, HS3),
 };
-#endif /* ifdef CONFIG_SOC_IMX6Q */
 
-#ifdef CONFIG_SOC_IMX6SL
 const struct imx_mxc_ehci_data imx6sl_mxc_ehci_hs_data[] __initconst = {
        imx_mxc_ehci_data_entry_single(MX6SL, 1, HS1),
        imx_mxc_ehci_data_entry_single(MX6SL, 2, HS2),
        imx_mxc_ehci_data_entry_single(MX6SL, 3, HS3),
 };
-#endif /* ifdef CONFIG_SOC_IMX6SL */
+#endif /* ifdef CONFIG_SOC_IMX6Q */
 
 struct platform_device *__init imx_add_mxc_ehci(
                const struct imx_mxc_ehci_data *data,