diff options
| author | Tony LIU <junjie.liu@freescale.com> | 2012-05-17 09:46:38 +0800 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2012-07-20 13:37:35 +0800 |
| commit | 0d244c11d9051613f9b0e1c75eeeaaed56dc835d (patch) | |
| tree | 15718b70f77a4c0b31810e76a3ecae0f90c9449b | |
| parent | f9f266bc8db60629cf656f98b506a3673a5798d5 (diff) | |
ENGR00209480-6 mx6sl_usb : fix build error
fix build error
Signed-off-by: Tony LIU <junjie.liu@freescale.com>
| -rw-r--r-- | arch/arm/plat-mxc/devices/platform-fsl-usb2-wakeup.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/devices/platform-mxc-ehci.c | 4 |
2 files changed, 1 insertions, 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, |