projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
[linux-2.6-microblaze.git]
/
drivers
/
pcmcia
/
pxa2xx_base.c
diff --git
a/drivers/pcmcia/pxa2xx_base.c
b/drivers/pcmcia/pxa2xx_base.c
index
64d433e
..
490bb82
100644
(file)
--- a/
drivers/pcmcia/pxa2xx_base.c
+++ b/
drivers/pcmcia/pxa2xx_base.c
@@
-29,7
+29,6
@@
#include <mach/smemc.h>
#include <asm/io.h>
#include <asm/irq.h>
#include <mach/smemc.h>
#include <asm/io.h>
#include <asm/irq.h>
-#include <asm/system.h>
#include <mach/pxa2xx-regs.h>
#include <asm/mach-types.h>
#include <mach/pxa2xx-regs.h>
#include <asm/mach-types.h>
@@
-318,10
+317,7
@@
static int pxa2xx_drv_pcmcia_probe(struct platform_device *dev)
skt->nr = ops->first + i;
skt->clk = clk;
skt->nr = ops->first + i;
skt->clk = clk;
- skt->ops = ops;
- skt->socket.owner = ops->owner;
- skt->socket.dev.parent = &dev->dev;
- skt->socket.pci_irq = NO_IRQ;
+ soc_pcmcia_init_one(skt, ops, &dev->dev);
ret = pxa2xx_drv_pcmcia_add_one(skt);
if (ret)
ret = pxa2xx_drv_pcmcia_add_one(skt);
if (ret)