On Monday 06 April 2009, Ajay Kumar Gupta wrote: > As the parent patch for NOP transceiver got modified which now does the > NOP device registration also so removing registration part from > usb-musb.c file. > > Signed-off-by: Ajay Kumar Gupta <ajay.gupta@xxxxxx> > --- > Against latest linux-omap tree as on 6th April. NAK -- see earlier comment > > arch/arm/mach-omap2/usb-musb.c | 20 ++------------------ > 1 files changed, 2 insertions(+), 18 deletions(-) > > diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c > index 927c2d9..e932b8c 100644 > --- a/arch/arm/mach-omap2/usb-musb.c > +++ b/arch/arm/mach-omap2/usb-musb.c > @@ -25,6 +25,7 @@ > #include <linux/io.h> > > #include <linux/usb/musb.h> > +#include <linux/usb/otg.h> > > #include <mach/hardware.h> > #include <mach/irqs.h> > @@ -145,20 +146,6 @@ static struct platform_device musb_device = { > .resource = musb_resources, > }; > > -#ifdef CONFIG_NOP_USB_XCEIV > -static u64 nop_xceiv_dmamask = DMA_32BIT_MASK; > - > -static struct platform_device nop_xceiv_device = { > - .name = "nop_usb_xceiv", > - .id = -1, > - .dev = { > - .dma_mask = &nop_xceiv_dmamask, > - .coherent_dma_mask = DMA_32BIT_MASK, > - .platform_data = NULL, > - }, > -}; > -#endif > - > void __init usb_musb_init(void) > { > if (cpu_is_omap243x()) { > @@ -172,10 +159,7 @@ void __init usb_musb_init(void) > musb_resources[0].end = musb_resources[0].start + SZ_8K - 1; > > #ifdef CONFIG_NOP_USB_XCEIV > - if (platform_device_register(&nop_xceiv_device) < 0) { > - printk(KERN_ERR "Unable to register NOP-XCEIV device\n"); > - return; > - } > + usb_nop_xceiv_register(); > #endif > > if (platform_device_register(&musb_device) < 0) { > -- > 1.6.0.3 > > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html