diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-01-06 11:19:25 +0100 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-02-17 17:37:10 +0100 |
| commit | 4e8804ff6dd1a842d9531c819a0acc9eb3bcfa3b (patch) | |
| tree | cee52e1f86c1896663b2e1932b6b27ae48683065 | |
| 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>
| -rw-r--r-- | drivers/pcmcia/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/pcmcia/m8xx_pcmcia.c | 2 | ||||
| -rw-r--r-- | include/pcmcia/ss.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig index 7e9fd38e14f..44b324b80e9 100644 --- a/drivers/pcmcia/Kconfig +++ b/drivers/pcmcia/Kconfig @@ -163,7 +163,6 @@ config PCMCIA_M8XX tristate "MPC8xx PCMCIA support" depends on PCMCIA && PPC && 8xx select PCCARD_IODYN - select PCCARD_NONSTATIC help Say Y here to include support for PowerPC 8xx series PCMCIA controller. diff --git a/drivers/pcmcia/m8xx_pcmcia.c b/drivers/pcmcia/m8xx_pcmcia.c index 7f79c4e169a..3a1fe3ab2cd 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, socket[i].socket.io_offset = 0; socket[i].socket.pci_irq = pcmcia_schlvl; socket[i].socket.ops = &m8xx_services; - socket[i].socket.resource_ops = &pccard_nonstatic_ops; + socket[i].socket.resource_ops = &pccard_iodyn_ops; socket[i].socket.cb_dev = NULL; socket[i].socket.dev.parent = &ofdev->dev; socket[i].pcmcia = pcmcia; diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h index b4e5cfd49ce..1a4737933bf 100644 --- a/include/pcmcia/ss.h +++ b/include/pcmcia/ss.h @@ -258,6 +258,8 @@ struct pcmcia_socket { * - pccard_static_ops iomem and ioport areas are assigned statically * - pccard_iodyn_ops iomem areas is assigned statically, ioport * areas dynamically + * If this option is selected, use + * "select PCCARD_IODYN" in Kconfig. * - pccard_nonstatic_ops iomem and ioport areas are assigned dynamically. * If this option is selected, use * "select PCCARD_NONSTATIC" in Kconfig. |