[U-Boot] [PATCH v7 1/4] gpio: Move common gpio.h to include/asm-generic

[Kim Phillips]

On Wed, 12 Oct 2011 15:55:25 +0000
Laurence Withers <lwithers at guralp.com> wrote:

> On Tue, Oct 11, 2011 at 10:50:12PM -0500, Joe Hershberger wrote:
> > Common GPIO API used by cmd_gpio should be available to any arch
> > 
> > Signed-off-by: Joe Hershberger <joe.hershberger at ni.com>
> > Cc: Joe Hershberger <joe.hershberger at gmail.com>
> > Cc: Kim Phillips <kim.phillips at freescale.com>
> 
> Tested-by: Laurence Withers <lwithers at guralp.com>

the initial two patches in this patchseries conflict with upstream:

commit 9d2cb8e8e6a3650613eab95c1b30023e81beb15c
Author: Simon Glass <sjg at chromium.org>
Date:   Fri Oct 7 13:53:50 2011 +0000

    Add generic gpio.h in asm-generic

And if I try applying the latter two, I get this:

$ ./MAKEALL MPC8313ERDB_33
Configuring for MPC8313ERDB_33 - Board: MPC8313ERDB, Options: SYS_33MHZ
mpc83xx_gpio.c:25:22: fatal error: asm/gpio.h: No such file or directory
compilation terminated.
make[1]: *** No rule to make target `.depend', needed by `libgpio.o'.  Stop.
make: *** [drivers/gpio/libgpio.o] Error 2
make: *** Waiting for unfinished jobs....
cmd_gpio.c:12:22: fatal error: asm/gpio.h: No such file or directory
compilation terminated.
make[1]: *** No rule to make target `.depend', needed by `libcommon.o'.  Stop.
make[1]: *** Waiting for unfinished jobs....
make: *** [common/libcommon.o] Error 2
powerpc-linux-gnu-size: './u-boot': No such file

please rebase and resubmit.

Thanks,

Kim