diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-28 14:15:43 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-28 14:15:43 +0000 |
| commit | dc52b5bf2c94828fd3c8d26f4ca810d4ba53999a (patch) | |
| tree | d8bfc950911cbe40f541d0e424650598075fb8be /drivers/pcmcia | |
| parent | 542f869f1826f092606efd0c4c771f070d1314f5 (diff) | |
| parent | d66ea8d4c2aa7199cf4e5c977eb25764e5fc5da9 (diff) | |
| download | kernel_samsung_aries-dc52b5bf2c94828fd3c8d26f4ca810d4ba53999a.zip kernel_samsung_aries-dc52b5bf2c94828fd3c8d26f4ca810d4ba53999a.tar.gz kernel_samsung_aries-dc52b5bf2c94828fd3c8d26f4ca810d4ba53999a.tar.bz2 | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Diffstat (limited to 'drivers/pcmcia')
| -rw-r--r-- | drivers/pcmcia/pxa2xx_base.c | 4 | ||||
| -rw-r--r-- | drivers/pcmcia/pxa2xx_palmld.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c index 16f84aa..c49a726 100644 --- a/drivers/pcmcia/pxa2xx_base.c +++ b/drivers/pcmcia/pxa2xx_base.c @@ -214,7 +214,7 @@ static void pxa2xx_configure_sockets(struct device *dev) MECR |= MECR_CIT; /* Set MECR:NOS (Number Of Sockets) */ - if (ops->nr > 1 || machine_is_viper()) + if ((ops->first + ops->nr) > 1 || machine_is_viper()) MECR |= MECR_NOS; else MECR &= ~MECR_NOS; @@ -250,7 +250,7 @@ int __pxa2xx_drv_pcmcia_probe(struct device *dev) for (i = 0; i < ops->nr; i++) { skt = &sinfo->skt[i]; - skt->nr = i; + skt->nr = ops->first + i; skt->irq = NO_IRQ; skt->res_skt.start = _PCMCIA(skt->nr); diff --git a/drivers/pcmcia/pxa2xx_palmld.c b/drivers/pcmcia/pxa2xx_palmld.c index 1736c67..5ba9b36 100644 --- a/drivers/pcmcia/pxa2xx_palmld.c +++ b/drivers/pcmcia/pxa2xx_palmld.c @@ -98,8 +98,8 @@ static void palmld_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt) static struct pcmcia_low_level palmld_pcmcia_ops = { .owner = THIS_MODULE, - .first = 0, - .nr = 2, + .first = 1, + .nr = 1, .hw_init = palmld_pcmcia_hw_init, .hw_shutdown = palmld_pcmcia_hw_shutdown, |