From 74a8df6eb729733c849bdf5690c3e68e4cc5e5a3 Mon Sep 17 00:00:00 2001 From: Tony LIU Date: Thu, 17 May 2012 09:46:38 +0800 Subject: [PATCH] ENGR00209480-6 mx6sl_usb : fix build error fix build error Signed-off-by: Tony LIU --- arch/arm/plat-mxc/devices/platform-fsl-usb2-wakeup.c | 2 -- arch/arm/plat-mxc/devices/platform-mxc-ehci.c | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) 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 cc6732db0dd6..986b766fabde 100644 --- 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 94fdf119a5b8..c39f6d7561c6 100644 --- 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, -- 2.39.5