On 08/13/10 15:06, Uwe Kleine-König wrote:
> The build failure was introduced by
>
> 13dd0c9 (USB: otg/ulpi: extend the generic ulpi driver.)
>
> Cc: Igor Grinberg <grinberg@xxxxxxxxxxxxxx>
> Cc: Mike Rapoport <mike@xxxxxxxxxxxxxx>
> Cc: Greg Kroah-Hartman <gregkh@xxxxxxx>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
>
I've based my patches on v2.6.35-rc6, so I could not patch
those imx variants, sorry...
But I did deal with mach-pca100.c, so I think moving it from
mach-mx2 to mach-imx is what made it miss my patch.
Anyway, this looks like the right addition.
Thanks
> ---
> arch/arm/mach-imx/mach-cpuimx27.c | 4 ++--
> arch/arm/mach-imx/mach-pca100.c | 4 ++--
> arch/arm/mach-mx25/mach-cpuimx25.c | 2 +-
> arch/arm/mach-mx3/mach-cpuimx35.c | 2 +-
> 4 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm/mach-imx/mach-cpuimx27.c b/arch/arm/mach-imx/mach-cpuimx27.c
> index 575ff1a..339150a 100644
> --- a/arch/arm/mach-imx/mach-cpuimx27.c
> +++ b/arch/arm/mach-imx/mach-cpuimx27.c
> @@ -279,13 +279,13 @@ static void __init eukrea_cpuimx27_init(void)
> #if defined(CONFIG_USB_ULPI)
> if (otg_mode_host) {
> otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
> - USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
> + ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);
>
> mxc_register_device(&mxc_otg_host, &otg_pdata);
> }
>
> usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
> - USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
> + ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);
>
> mxc_register_device(&mxc_usbh2, &usbh2_pdata);
> #endif
> diff --git a/arch/arm/mach-imx/mach-pca100.c b/arch/arm/mach-imx/mach-pca100.c
> index a389d11..23c9e1f 100644
> --- a/arch/arm/mach-imx/mach-pca100.c
> +++ b/arch/arm/mach-imx/mach-pca100.c
> @@ -419,13 +419,13 @@ static void __init pca100_init(void)
> #if defined(CONFIG_USB_ULPI)
> if (otg_mode_host) {
> otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
> - USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
> + ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);
>
> mxc_register_device(&mxc_otg_host, &otg_pdata);
> }
>
> usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
> - USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
> + ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);
>
> mxc_register_device(&mxc_usbh2, &usbh2_pdata);
> #endif
> diff --git a/arch/arm/mach-mx25/mach-cpuimx25.c b/arch/arm/mach-mx25/mach-cpuimx25.c
> index 56b2e26..a5f0174 100644
> --- a/arch/arm/mach-mx25/mach-cpuimx25.c
> +++ b/arch/arm/mach-mx25/mach-cpuimx25.c
> @@ -138,7 +138,7 @@ static void __init eukrea_cpuimx25_init(void)
> #if defined(CONFIG_USB_ULPI)
> if (otg_mode_host) {
> otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
> - USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
> + ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);
>
> mxc_register_device(&mxc_otg, &otg_pdata);
> }
> diff --git a/arch/arm/mach-mx3/mach-cpuimx35.c b/arch/arm/mach-mx3/mach-cpuimx35.c
> index 63f970f..9770a6a 100644
> --- a/arch/arm/mach-mx3/mach-cpuimx35.c
> +++ b/arch/arm/mach-mx3/mach-cpuimx35.c
> @@ -192,7 +192,7 @@ static void __init mxc_board_init(void)
> #if defined(CONFIG_USB_ULPI)
> if (otg_mode_host) {
> otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
> - USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
> + ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);
>
> mxc_register_device(&mxc_otg_host, &otg_pdata);
> }
>
--
Regards,
Igor.
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
