[PATCH] beagle: fix usb dependencies

[Nishanth Menon]

On 08/17/2010 03:40 AM, Michael Grzeschik wrote:
> Signed-off-by: Michael Grzeschik<m.grzeschik at pengutronix.de>
Acked-by: Nishanth Menon <nm at ti.com>
> ---
>   arch/arm/boards/omap/Kconfig        |    2 --
>   arch/arm/boards/omap/board-beagle.c |    4 ++++
>   2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/boards/omap/Kconfig b/arch/arm/boards/omap/Kconfig
> index 6012227..d612064 100644
> --- a/arch/arm/boards/omap/Kconfig
> +++ b/arch/arm/boards/omap/Kconfig
> @@ -48,8 +48,6 @@ config MACH_BEAGLE
>   	select MACH_HAS_LOWLEVEL_INIT
>   	select OMAP_CLOCK_ALL
>   	select HAS_OMAP_NAND
> -	select USB_EHCI_OMAP
> -	select USB_TWL4030
>   	  help
>   	  Say Y here if you are using Beagle Board
>
> diff --git a/arch/arm/boards/omap/board-beagle.c b/arch/arm/boards/omap/board-beagle.c
> index c0b6b43..e9d3072 100644
> --- a/arch/arm/boards/omap/board-beagle.c
> +++ b/arch/arm/boards/omap/board-beagle.c
> @@ -273,6 +273,7 @@ static struct device_d sdram_dev = {
>   	.platform_data =&sram_pdata,
>   };
>
> +#ifdef CONFIG_USB_EHCI_OMAP
>   static struct omap_hcd omap_ehci_pdata = {
>   	.port_mode[0] = EHCI_HCD_OMAP_MODE_PHY,
>   	.port_mode[1] = EHCI_HCD_OMAP_MODE_PHY,
> @@ -295,6 +296,7 @@ static struct device_d usbh_dev = {
>   	.size     = 4 * 1024,
>   	.platform_data =&ehci_pdata,
>   };
> +#endif /* CONFIG_USB_EHCI_OMAP */
>
>   static struct device_d i2c_dev = {
>   	.name		= "i2c-omap",
> @@ -318,8 +320,10 @@ static int beagle_devices_init(void)
>   	i2c_register_board_info(0, i2c_devices, ARRAY_SIZE(i2c_devices));
>   	register_device(&i2c_dev);
>
> +#ifdef CONFIG_USB_EHCI_OMAP
>   	if (ehci_omap_init(&omap_ehci_pdata)>= 0)
>   		register_device(&usbh_dev);
> +#endif /* CONFIG_USB_EHCI_OMAP */
>   #ifdef CONFIG_GPMC
>   	/* WP is made high and WAIT1 active Low */
>   	gpmc_generic_init(0x10);