On Tue, 4 Jun 2013, Arnd Bergmann wrote:
> The OHCI host controller driver can be built standalone now,
> without enabling any of the available bus glue drivers, so
> there is not really a reason to error out here:
>
> drivers/usb/host/ohci-hcd.c:1258: error:
> #error "missing bus glue for ohci-hcd" #error "missing bus glue for ohci-hcd"
>
> This follows the same change done in ehci recently as 843e56c0
> "USB: EHCI: remove bogus #error" and hopefully avoids future
> merge conflicts in this list.
>
> Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
> Cc: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
> Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> ---
> diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
> index 4847ee9..a9d3437 100644
> --- a/drivers/usb/host/ohci-hcd.c
> +++ b/drivers/usb/host/ohci-hcd.c
> @@ -1262,26 +1262,6 @@ MODULE_LICENSE ("GPL");
> #define PLATFORM_DRIVER ohci_hcd_tilegx_driver
> #endif
>
> -#if !IS_ENABLED(CONFIG_USB_OHCI_HCD_PCI) && \
> - !IS_ENABLED(CONFIG_USB_OHCI_HCD_PLATFORM) && \
> - !defined(PLATFORM_DRIVER) && \
> - !defined(OMAP1_PLATFORM_DRIVER) && \
> - !defined(OMAP3_PLATFORM_DRIVER) && \
> - !defined(OF_PLATFORM_DRIVER) && \
> - !defined(SA1111_DRIVER) && \
> - !defined(PS3_SYSTEM_BUS_DRIVER) && \
> - !defined(SM501_OHCI_DRIVER) && \
> - !defined(TMIO_OHCI_DRIVER) && \
> - !defined(S3C2410_PLATFORM_DRIVER) && \
> - !defined(EXYNOS_PLATFORM_DRIVER) && \
> - !defined(EP93XX_PLATFORM_DRIVER) && \
> - !defined(AT91_PLATFORM_DRIVER) && \
> - !defined(NXP_PLATFORM_DRIVER) && \
> - !defined(DAVINCI_PLATFORM_DRIVER) && \
> - !defined(SPEAR_PLATFORM_DRIVER)
> -#error "missing bus glue for ohci-hcd"
> -#endif
> -
> static int __init ohci_hcd_mod_init(void)
> {
> int retval = 0;
Acked-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
--
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
