On Fri, 2013-06-14 at 11:12 +0200, Teresa Gamez wrote: > Am 10.06.2013 21:31, schrieb Jan Luebbe: > > Signed-off-by: Jan Luebbe <jlu@xxxxxxxxxxxxxx> > > --- > > arch/arm/mach-omap/include/mach/am33xx-devices.h | 17 +++++++++++++++++ > > arch/arm/mach-omap/include/mach/am33xx-silicon.h | 4 ++++ > > drivers/spi/Kconfig | 2 +- > > 3 files changed, 22 insertions(+), 1 deletion(-) > > > > diff --git a/arch/arm/mach-omap/include/mach/am33xx-devices.h b/arch/arm/mach-omap/include/mach/am33xx-devices.h > > index fe9fba9..cea4504 100644 > > --- a/arch/arm/mach-omap/include/mach/am33xx-devices.h > > +++ b/arch/arm/mach-omap/include/mach/am33xx-devices.h > > @@ -7,6 +7,7 @@ > > #include <mach/devices.h> > > #include <mach/omap_hsmmc.h> > > #include <mach/cpsw.h> > > +#include <mach/omap_hsmmc.h> > > this header has been already included just two lines before. Oh, this must have slipped in while rebasing. Sascha, could you drop this if the rest is acceptable? Regards, Jan -- 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
