On Thu, Nov 24, 2011 at 04:02:36AM +0100, Robert Jarzmik wrote: > From: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx> > > Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> > Signed-off-by: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx> > > Conflicts: > > arch/arm/cpu/Makefile > drivers/serial/Makefile > --- > arch/arm/Kconfig | 4 + > arch/arm/Makefile | 2 + > arch/arm/cpu/Kconfig | 5 + > arch/arm/cpu/Makefile | 1 + > arch/arm/mach-pxa/Kconfig | 37 ++ > arch/arm/mach-pxa/Makefile | 6 + > arch/arm/mach-pxa/clocksource.c | 50 +++ > arch/arm/mach-pxa/common.c | 42 +++ > arch/arm/mach-pxa/gpio.c | 70 ++++ > arch/arm/mach-pxa/include/mach/clock.h | 16 + > arch/arm/mach-pxa/include/mach/gpio.h | 137 ++++++++ > arch/arm/mach-pxa/include/mach/hardware.h | 31 ++ > arch/arm/mach-pxa/include/mach/mfp-pxa27x.h | 438 ++++++++++++++++++++++++ > arch/arm/mach-pxa/include/mach/mfp-pxa2xx.h | 133 ++++++++ > arch/arm/mach-pxa/include/mach/mfp.h | 21 ++ > arch/arm/mach-pxa/include/mach/pxa-regs.h | 33 ++ > arch/arm/mach-pxa/include/mach/pxa27x-regs.h | 6 + > arch/arm/mach-pxa/include/mach/pxa2xx-regs.h | 267 +++++++++++++++ > arch/arm/mach-pxa/include/mach/regs-intc.h | 34 ++ > arch/arm/mach-pxa/include/mach/regs-ost.h | 34 ++ > arch/arm/mach-pxa/include/plat/gpio.h | 55 +++ > arch/arm/mach-pxa/include/plat/mfp.h | 468 ++++++++++++++++++++++++++ > arch/arm/mach-pxa/mfp-pxa2xx.c | 189 +++++++++++ > arch/arm/mach-pxa/speed-pxa27x.c | 20 ++ > drivers/serial/Kconfig | 4 + > drivers/serial/Makefile | 1 + > drivers/serial/serial_pxa.c | 203 +++++++++++ Please remove or update the serial driver here. It still uses map_base and won't compile currently. 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
