Patchwork [meta-handheld,2/3] linux-yocto_3.4: remove superseded patch for collie and fix do_patch

login
register
mail settings
Submitter Andrea Adami
Date Dec. 6, 2012, 12:07 a.m.
Message ID <1354752430-14139-2-git-send-email-andrea.adami@gmail.com>
Download mbox | patch
Permalink /patch/40545/
State Accepted, archived
Headers show

Comments

Andrea Adami - Dec. 6, 2012, 12:07 a.m.
* there have been two commits fixing drivers/pcmcia/pxa2xx-sharpsl.c

* PCMCIA: pxa: convert PXA socket drivers to use new irq/gpio managemen
* a9bb5a4bf9f84256499c802fd397d56d55227e4f
*
* pcmcia: sharpsl: don't discard sharpsl_pcmcia_ops
* fdc858a466b738d35d3492bc7cf77b1dac98bf7c

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
 ...xx_sharpsl-retain-ops-structure-on-collie.patch |   34 --------------------
 .../linux/linux-yocto-3.4/collie/collie.scc        |    1 -
 2 files changed, 0 insertions(+), 35 deletions(-)
 delete mode 100644 recipes-kernel/linux/linux-yocto-3.4/collie/0001-pcmcia-pxa2xx_sharpsl-retain-ops-structure-on-collie.patch

Patch

diff --git a/recipes-kernel/linux/linux-yocto-3.4/collie/0001-pcmcia-pxa2xx_sharpsl-retain-ops-structure-on-collie.patch b/recipes-kernel/linux/linux-yocto-3.4/collie/0001-pcmcia-pxa2xx_sharpsl-retain-ops-structure-on-collie.patch
deleted file mode 100644
index d86b47d..0000000
--- a/recipes-kernel/linux/linux-yocto-3.4/collie/0001-pcmcia-pxa2xx_sharpsl-retain-ops-structure-on-collie.patch
+++ /dev/null
@@ -1,34 +0,0 @@ 
-From 31d99c4c9f14e571ca0e22c5862dd5b6a871e2dd Mon Sep 17 00:00:00 2001
-From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
-Date: Fri, 5 Aug 2011 15:32:23 +0400
-Subject: [PATCH] pcmcia/pxa2xx_sharpsl: retain ops structure on collie
-
-The pxa2xx_sharpsl driver part is also used on collie, which (as
-a StrongARM board) has different expectations for PCMCIA drivers.
-So, on collie place sharpsl_pcmcia_ops in .data section rather than
-in __initdata.
-
-Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
----
- drivers/pcmcia/pxa2xx_sharpsl.c |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/pcmcia/pxa2xx_sharpsl.c b/drivers/pcmcia/pxa2xx_sharpsl.c
-index 81af2b3..1b5b749 100644
---- a/drivers/pcmcia/pxa2xx_sharpsl.c
-+++ b/drivers/pcmcia/pxa2xx_sharpsl.c
-@@ -222,7 +222,11 @@ static void sharpsl_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
- 	sharpsl_pcmcia_init_reset(skt);
- }
- 
-+#ifdef CONFIG_SA1100_COLLIE
-+static struct pcmcia_low_level sharpsl_pcmcia_ops = {
-+#else
- static struct pcmcia_low_level sharpsl_pcmcia_ops __initdata = {
-+#endif
- 	.owner                  = THIS_MODULE,
- 	.hw_init                = sharpsl_pcmcia_hw_init,
- 	.hw_shutdown            = sharpsl_pcmcia_hw_shutdown,
--- 
-1.7.2.5
-
diff --git a/recipes-kernel/linux/linux-yocto-3.4/collie/collie.scc b/recipes-kernel/linux/linux-yocto-3.4/collie/collie.scc
index 45ac852..b7c11fa 100644
--- a/recipes-kernel/linux/linux-yocto-3.4/collie/collie.scc
+++ b/recipes-kernel/linux/linux-yocto-3.4/collie/collie.scc
@@ -3,4 +3,3 @@  kconf hardware collie.cfg
 include ../zaurus-common.scc
 
 patch locomo_kbd_tweak-r2.patch
-patch 0001-pcmcia-pxa2xx_sharpsl-retain-ops-structure-on-collie.patch