diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-01-06 05:19:25 -0500 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-02-17 11:37:10 -0500 |
commit | 4e8804ff6dd1a842d9531c819a0acc9eb3bcfa3b (patch) | |
tree | cee52e1f86c1896663b2e1932b6b27ae48683065 /drivers/pcmcia/m8xx_pcmcia.c | |
parent | a7eb169dc7292979d78f2d2f1655026ae3a9ff5f (diff) |
pcmcia: m8xx_pcmcia.c should use iodyn resource manager
The socket driver m8xx_pcmcia.c uses a static memory assignment,
but io_offset is set to 0. Therefore, it seems proper to use the
iodyn resource manager for this driver, as was previously the
case (before commit 80128ff79d282cf71b1819dbca9b8dd47d8ed3e8).
CC: Vitaly Bordug <vitb@kernel.crashing.org>
CC: Arnd Bergmann <arnd@arndb.de>
CC: Olof Johansson <olof@lixom.net>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/m8xx_pcmcia.c')
-rw-r--r-- | drivers/pcmcia/m8xx_pcmcia.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/m8xx_pcmcia.c b/drivers/pcmcia/m8xx_pcmcia.c index 7f79c4e169ae..3a1fe3ab2cd4 100644 --- a/drivers/pcmcia/m8xx_pcmcia.c +++ b/drivers/pcmcia/m8xx_pcmcia.c | |||
@@ -1233,7 +1233,7 @@ static int __init m8xx_probe(struct of_device *ofdev, | |||
1233 | socket[i].socket.io_offset = 0; | 1233 | socket[i].socket.io_offset = 0; |
1234 | socket[i].socket.pci_irq = pcmcia_schlvl; | 1234 | socket[i].socket.pci_irq = pcmcia_schlvl; |
1235 | socket[i].socket.ops = &m8xx_services; | 1235 | socket[i].socket.ops = &m8xx_services; |
1236 | socket[i].socket.resource_ops = &pccard_nonstatic_ops; | 1236 | socket[i].socket.resource_ops = &pccard_iodyn_ops; |
1237 | socket[i].socket.cb_dev = NULL; | 1237 | socket[i].socket.cb_dev = NULL; |
1238 | socket[i].socket.dev.parent = &ofdev->dev; | 1238 | socket[i].socket.dev.parent = &ofdev->dev; |
1239 | socket[i].pcmcia = pcmcia; | 1239 | socket[i].pcmcia = pcmcia; |