diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-02-28 15:17:36 -0500 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-02-28 15:17:36 -0500 |
| commit | 89d7f11d89e5e23549ff85a8260df0c01e2c550b (patch) | |
| tree | 8da4424e784addf6850028eeb47ca9724be99cf0 /drivers | |
| parent | 3856c3c5c09f3b22079e3154d823c7ab936c7d92 (diff) | |
| parent | 78240e37963ac6f4483f6473c786c0f0ab7e78fe (diff) | |
Merge remote-tracking branch 'rmk/fixes' into linaro-2.6.38
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pcmcia/pxa2xx_colibri.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/pcmcia/pxa2xx_colibri.c b/drivers/pcmcia/pxa2xx_colibri.c index c3f72192af6..a52039564e7 100644 --- a/drivers/pcmcia/pxa2xx_colibri.c +++ b/drivers/pcmcia/pxa2xx_colibri.c @@ -181,6 +181,9 @@ static int __init colibri_pcmcia_init(void) { int ret; + if (!machine_is_colibri() && !machine_is_colibri320()) + return -ENODEV; + colibri_pcmcia_device = platform_device_alloc("pxa2xx-pcmcia", -1); if (!colibri_pcmcia_device) return -ENOMEM; |