Hi Felipe, >-----Original Message----- >From: Felipe Balbi [mailto:[email protected]] >Sent: Thursday, February 17, 2011 5:24 PM >To: Felipe Balbi >Cc: Hema HK; [email protected]; >[email protected]; Tony Lindgren; Kevin Hilman; >Cousson, Benoit; Paul Walmsley >Subject: Re: [PATCH 5/6 v8] OMAP2+: musb: hwmod adaptation for >musb registration > >Hi, > >On Thu, Feb 17, 2011 at 01:33:21PM +0200, Felipe Balbi wrote: >> On Thu, Feb 17, 2011 at 12:07:21PM +0530, Hema HK wrote: >> > Using omap_device_build API instead of platform_device_register for >> > OMAP2430,OMAP3xxx, OMAP4430 and AM35x musb device registration. >> > The device specific resources defined in centralized >> > database will be used. >> > >> > Signed-off-by: Hema HK <[email protected]> >> > Cc: Felipe Balbi <[email protected]> >> > Cc: Tony Lindgren <[email protected]> >> > Cc: Kevin Hilman <[email protected]> >> > Cc: Cousson, Benoit <[email protected]> >> > Cc: Paul Walmsley <[email protected]> >> >> doesn't apply: >> >> OMAP2+: musb: hwmod adaptation for musb registration >> >> Using omap_device_build API instead of platform_device_register for >> OMAP2430,OMAP3xxx, OMAP4430 and AM35x musb device registration. >> The device specific resources defined in centralized >> database will be used. >> >> Signed-off-by: Hema HK <[email protected]> >> Cc: Tony Lindgren <[email protected]> >> Cc: Kevin Hilman <[email protected]> >> Cc: Cousson, Benoit <[email protected]> >> Cc: Paul Walmsley <[email protected]> >> Signed-off-by: Felipe Balbi <[email protected]> >> -------------------------- >> Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y >> Applying: OMAP2+: musb: hwmod adaptation for musb registration >> error: patch failed: arch/arm/mach-omap2/usb-musb.c:30 >> error: arch/arm/mach-omap2/usb-musb.c: patch does not apply >> Patch failed at 0005 OMAP2+: musb: hwmod adaptation for musb >registration >> When you have resolved this problem run "git am --resolved". >> If you would prefer to skip this patch, instead run "git am --skip". >> To restore the original branch and stop patching run "git am >--abort". > >I fixed this one by hand, patch attached. Check if I fixed correctly. >Patch attached.
Yes. The fix is correct. Thanks for that. Regards, Hema > >-- >balbi > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
