diff options
| author | Marc Zyngier <maz@misterjones.org> | 2009-11-14 13:39:13 +0100 |
|---|---|---|
| committer | Eric Miao <eric.y.miao@gmail.com> | 2009-12-13 21:42:58 +0800 |
| commit | c2de1c382933fd9ef0a3db13b6747115e1e32c56 (patch) | |
| tree | d9e0fa251d376fb7d5f9906952bf02f2f31570e0 /drivers/pcmcia/pxa2xx_base.c | |
| parent | e491a11c77a4ed93ec14cc052b1f048bddc9e99a (diff) | |
| download | op-kernel-dev-c2de1c382933fd9ef0a3db13b6747115e1e32c56.zip op-kernel-dev-c2de1c382933fd9ef0a3db13b6747115e1e32c56.tar.gz | |
[ARM] pxa/zeus: make Viper pcmcia support more generic to support Zeus
The Arcom Zeus CF slot requires the same kind of support as the Viper.
To avoid code duplication, introduce a platform device that abstracts
the differences.
This also allows for the removal of the ugly export of viper_cf_rst().
Signed-off-by: Marc Zyngier <maz@misterjones.org>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'drivers/pcmcia/pxa2xx_base.c')
| -rw-r--r-- | drivers/pcmcia/pxa2xx_base.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c index 84dde776..87481ce 100644 --- a/drivers/pcmcia/pxa2xx_base.c +++ b/drivers/pcmcia/pxa2xx_base.c @@ -214,7 +214,8 @@ static void pxa2xx_configure_sockets(struct device *dev) MECR |= MECR_CIT; /* Set MECR:NOS (Number Of Sockets) */ - if ((ops->first + ops->nr) > 1 || machine_is_viper()) + if ((ops->first + ops->nr) > 1 || + machine_is_viper() || machine_is_arcom_zeus()) MECR |= MECR_NOS; else MECR &= ~MECR_NOS; |
