[PATCH v3 2/2] ARM : OMAP : Remove #ifdef from board-omap3evm.c

[PATCH v3 2/2] ARM : OMAP : Remove #ifdef from board-omap3evm.c

[Maulik Mankad]

ARM : OMAP : Remove #ifdef from board-omap3evm.c

Remove #ifdef around usb_nop_xceiv_register() from
board-omap3evm.c

Signed-off-by: Maulik Mankad <x0082077-l0cyMroinI0@public.gmane.org>
Cc: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
Cc: Felipe Balbi <felipe.balbi-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org>
Cc: Greg Kroah-Hartman <gregkh-l3A5Bk7waGM@public.gmane.org>
Cc: Olof Johansson <olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>
---
Index: felipe_musb/arch/arm/mach-omap2/board-omap3evm.c
===================================================================
--- felipe_musb.orig/arch/arm/mach-omap2/board-omap3evm.c
+++ felipe_musb/arch/arm/mach-omap2/board-omap3evm.c
@@ -444,10 +444,10 @@ static void __init omap3_evm_init(void)
 				ARRAY_SIZE(omap3evm_spi_board_info));
 
 	omap_serial_init();
-#ifdef CONFIG_NOP_USB_XCEIV
+
 	/* OMAP3EVM uses ISP1504 phy and so register nop transceiver */
 	usb_nop_xceiv_register();
-#endif
+
 	if (get_omap3_evm_rev() >= OMAP3EVM_BOARD_GEN_2) {
 		/* enable EHCI VBUS using GPIO22 */
 		omap_mux_init_gpio(22, OMAP_PIN_INPUT_PULLUP);
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v3 2/2] ARM : OMAP : Remove #ifdef from board-omap3evm.c

[Felipe Balbi]

On Tue, Jan 05, 2010 at 09:49:32AM +0100, ext Maulik Mankad wrote:
>ARM : OMAP : Remove #ifdef from board-omap3evm.c
>
>Remove #ifdef around usb_nop_xceiv_register() from
>board-omap3evm.c
>
>Signed-off-by: Maulik Mankad <x0082077@ti.com>
>Cc: Tony Lindgren <tony@atomide.com>

Acked-by: Felipe Balbi <felipe.balbi@nokia.com>

Tony, let's wait for Greg's Ack to the previous patch, but if everything 
is Fine, you can take this one on for-next.

-- 
balbi

Re: [PATCH v3 2/2] ARM : OMAP : Remove #ifdef from board-omap3evm.c

[Olof Johansson]

On Tue, Jan 05, 2010 at 02:19:32PM +0530, Maulik Mankad wrote:
> ARM : OMAP : Remove #ifdef from board-omap3evm.c
> 
> Remove #ifdef around usb_nop_xceiv_register() from
> board-omap3evm.c
> 
> Signed-off-by: Maulik Mankad <x0082077-l0cyMroinI0@public.gmane.org>
> Cc: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
> Cc: Felipe Balbi <felipe.balbi-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org>
> Cc: Greg Kroah-Hartman <gregkh-l3A5Bk7waGM@public.gmane.org>
> Cc: Olof Johansson <olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>

Acked-by: Olof Johansson <olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v3 2/2] ARM : OMAP : Remove #ifdef from board-omap3evm.c

[Greg KH]

On Tue, Jan 05, 2010 at 12:56:04PM +0200, Felipe Balbi wrote:
> On Tue, Jan 05, 2010 at 09:49:32AM +0100, ext Maulik Mankad wrote:
> >ARM : OMAP : Remove #ifdef from board-omap3evm.c
> >
> >Remove #ifdef around usb_nop_xceiv_register() from
> >board-omap3evm.c
> >
> >Signed-off-by: Maulik Mankad <x0082077@ti.com>
> >Cc: Tony Lindgren <tony@atomide.com>
> 
> Acked-by: Felipe Balbi <felipe.balbi@nokia.com>
> 
> Tony, let's wait for Greg's Ack to the previous patch, but if everything 
> is Fine, you can take this one on for-next.

I can take it as I took the one that this depended on.

Or both can go through Tony's tree, I don't care :)

If so, please add:
	Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
to the patches.

thanks,

greg k-h

Re: ARM: OMAP: Remove #ifdef from board-omap3evm.c

[Greg KH]

On Tue, Jan 05, 2010 at 02:19:32PM +0530, Maulik Mankad wrote:
> 
> ARM : OMAP : Remove #ifdef from board-omap3evm.c
> 
> Remove #ifdef around usb_nop_xceiv_register() from
> board-omap3evm.c
> 
> Signed-off-by: Maulik Mankad <x0082077-l0cyMroinI0@public.gmane.org>
> Cc: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
> Acked-by: Felipe Balbi <felipe.balbi-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org>
> Acked-by: Olof Johansson <olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>

I'm rejecting this one as well, as the previous one breaks the build.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v3 2/2] ARM : OMAP : Remove #ifdef from board-omap3evm.c

[Tony Lindgren]

* Greg KH <greg@kroah.com> [100115 12:14]:
> On Tue, Jan 05, 2010 at 12:56:04PM +0200, Felipe Balbi wrote:
> > On Tue, Jan 05, 2010 at 09:49:32AM +0100, ext Maulik Mankad wrote:
> > >ARM : OMAP : Remove #ifdef from board-omap3evm.c
> > >
> > >Remove #ifdef around usb_nop_xceiv_register() from
> > >board-omap3evm.c
> > >
> > >Signed-off-by: Maulik Mankad <x0082077@ti.com>
> > >Cc: Tony Lindgren <tony@atomide.com>
> > 
> > Acked-by: Felipe Balbi <felipe.balbi@nokia.com>
> > 
> > Tony, let's wait for Greg's Ack to the previous patch, but if everything 
> > is Fine, you can take this one on for-next.
> 
> I can take it as I took the one that this depended on.
> 
> Or both can go through Tony's tree, I don't care :)
> 
> If so, please add:
> 	Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
> to the patches.

Just to follow up on this, I've added both patches to omap
for-next queue. Compiles fine now, will also check compile
for x86.

Regards,

Tony