[U-Boot] [PATCH 6/8] fsl_dr_usb: Fixup disabled USB controllers nodes in device tree

[Wolfgang Denk]

Dear Anton Vorontsov,

In message <20090609202534.GF20493 at oksana.dev.rtsoft.ru> you wrote:
> We should add status = "disabled" property when USB controller can't
> be used (for example when USB pins muxed away to another device).
> 
> Also convert whole fdt_fixup_dr_usb() to use more compact routines
> from fdt_support.h.
> 
> Signed-off-by: Anton Vorontsov <avorontsov at ru.mvista.com>
> ---
>  cpu/mpc83xx/cpu.c            |    4 +++
>  drivers/usb/otg/fsl_dr_usb.c |   60 ++++++++++++++++++++++++-----------------
>  2 files changed, 39 insertions(+), 25 deletions(-)

[Oops, please ignore previous reply to wrong patch submission.]

Does not apply:

Applying: fsl_dr_usb: Fixup disabled USB controllers nodes in device tree
error: drivers/usb/otg/fsl_dr_usb.c: does not exist in index
fatal: sha1 information is lacking or useless
(drivers/usb/otg/fsl_dr_usb.c).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0006.

Please rebase and resubmit.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Punishment becomes ineffective after a certain point. Men become  in-
sensitive.
	-- Eneg, "Patterns of Force", stardate 2534.7