[RFC PATCH 05/10] PCMCIA: sa1111: wrap soc_pcmcia_socket to contain sa1111 specific data
Russell King - ARM Linux
linux at arm.linux.org.uk
Sun Oct 4 19:14:02 EDT 2009
On Sun, Oct 04, 2009 at 06:01:40PM -0500, Larry Finger wrote:
> Russell King wrote:
> > Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
> > ---
> > drivers/pcmcia/pxa2xx_base.c | 19 +++++++----
> > drivers/pcmcia/pxa2xx_base.h | 3 ++
> > drivers/pcmcia/pxa2xx_lubbock.c | 10 ++++--
> > drivers/pcmcia/sa1100_badge4.c | 7 ++++-
> > drivers/pcmcia/sa1100_jornada720.c | 20 ++++++++----
> > drivers/pcmcia/sa1100_neponset.c | 9 ++++-
> > drivers/pcmcia/sa1111_generic.c | 58 ++++++++++++++++++++++++++++--------
> > drivers/pcmcia/sa1111_generic.h | 14 ++++++++
> > drivers/pcmcia/sa11xx_base.c | 21 ++++++++----
> > drivers/pcmcia/sa11xx_base.h | 2 +
> > 10 files changed, 123 insertions(+), 40 deletions(-)
>
> What tree is this patch for? I get the following errors when applying
> to taday's pull of Linus's tree (git describe is
> v2.6.32-rc1-384-ga99bbaf):
>
> patching file drivers/pcmcia/sa1100_jornada720.c
> Hunk #1 FAILED at 24.
> Hunk #2 FAILED at 40.
> Hunk #3 FAILED at 85.
> Hunk #4 FAILED at 101.
> 4 out of 4 hunks FAILED -- rejects in file
> drivers/pcmcia/sa1100_jornada720.c
Guess that's because 5690/1 was been applied behind my back. I'll see
about rebasing the patch and discarding 5690 from the patch system.
More information about the linux-pcmcia
mailing list