From 198accca08fb16662eeeac49ea51801a270bfcc7 Mon Sep 17 00:00:00 2001 From: Russell King - ARM Linux Date: Sun, 29 Mar 2009 22:12:34 +0100 Subject: [PATCH] --- yaml --- r: 169127 b: refs/heads/master c: f397b9c5dcc30a575973b2e4f0a602fc85b38853 h: refs/heads/master i: 169125: dd8f0de8787b7c044156444f35e0fd2599d54acd 169123: a38357485203dceb26ea0cae0c4cdacf3d7e8e31 169119: 2ceb46d58956706aae0e9c3aecd7f7cfcadc2eeb v: v3 --- [refs] | 2 +- trunk/drivers/pcmcia/pxa2xx_base.c | 1 - trunk/drivers/pcmcia/sa11xx_base.c | 1 - trunk/drivers/pcmcia/soc_common.h | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ca47355af79f..f72cb4635822 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b62d99b5028b6df1c32b864fd9dd32ad6b42d396 +refs/heads/master: f397b9c5dcc30a575973b2e4f0a602fc85b38853 diff --git a/trunk/drivers/pcmcia/pxa2xx_base.c b/trunk/drivers/pcmcia/pxa2xx_base.c index c9c104b57c59..7f61b62a1de0 100644 --- a/trunk/drivers/pcmcia/pxa2xx_base.c +++ b/trunk/drivers/pcmcia/pxa2xx_base.c @@ -288,7 +288,6 @@ int __pxa2xx_drv_pcmcia_probe(struct device *dev) skt->nr = ops->first + i; skt->irq = NO_IRQ; - skt->dev = dev; skt->ops = ops; skt->socket.owner = ops->owner; skt->socket.dev.parent = dev; diff --git a/trunk/drivers/pcmcia/sa11xx_base.c b/trunk/drivers/pcmcia/sa11xx_base.c index 4db81490e5c9..ac9987243131 100644 --- a/trunk/drivers/pcmcia/sa11xx_base.c +++ b/trunk/drivers/pcmcia/sa11xx_base.c @@ -236,7 +236,6 @@ int sa11xx_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops, skt->nr = first + i; skt->irq = NO_IRQ; - skt->dev = dev; skt->ops = ops; skt->socket.owner = ops->owner; skt->socket.dev.parent = dev; diff --git a/trunk/drivers/pcmcia/soc_common.h b/trunk/drivers/pcmcia/soc_common.h index f7533dcba679..4fb06f797ad6 100644 --- a/trunk/drivers/pcmcia/soc_common.h +++ b/trunk/drivers/pcmcia/soc_common.h @@ -30,7 +30,6 @@ struct soc_pcmcia_socket { /* * Info from low level handler */ - struct device *dev; unsigned int nr; unsigned int irq;