On Fri, Apr 27, 2012 at 11:32:25AM +0200, Juergen Beisert wrote: > Signed-off-by: Juergen Beisert <jbe@xxxxxxxxxxxxxx> > --- > diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types > index ff97af4..f958ee6 100644 > --- a/arch/arm/tools/mach-types > +++ b/arch/arm/tools/mach-types > @@ -3963,3 +3963,4 @@ pcats_9307_type_a MACH_PCATS_9307_TYPE_A PCATS_9307_TYPE_A 4008 > pcats_9307_type_o MACH_PCATS_9307_TYPE_O PCATS_9307_TYPE_O 4009 > pcats_9307_type_r MACH_PCATS_9307_TYPE_R PCATS_9307_TYPE_R 4010 > streamplug MACH_STREAMPLUG STREAMPLUG 4011 > +th_link_eth MACH_THLINK_ETH THLINK_ETH 4156 No manual patching of this file please. I applied the other patches from this series. Thanks Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
