diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-07 20:45:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-07 20:45:42 -0800 |
| commit | 34d4ade77ba755afa6a2a04f043659781e4b6fc2 (patch) | |
| tree | 654a94f1de17b0c63d5450718c79c351437a5ff1 /drivers | |
| parent | 1a3453035f3e55aa419aa66b7eee62ddf590c70f (diff) | |
| parent | c0d61a7996d5511385953f9c03fa997da1d0eb4d (diff) | |
| download | linux-3.10-34d4ade77ba755afa6a2a04f043659781e4b6fc2.tar.gz linux-3.10-34d4ade77ba755afa6a2a04f043659781e4b6fc2.tar.bz2 linux-3.10-34d4ade77ba755afa6a2a04f043659781e4b6fc2.zip | |
Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
davinci: cpufreq: fix section mismatch warning
DaVinci: fix compilation warnings in <mach/clkdev.h>
davinci: tnetv107x: fix register indexing for GPIOs numbers > 31
davinci: da8xx/omap-l1x: add platform device for davinci-pcm-audio
ARM: pxa/tosa: register wm9712 codec device
ARM: pxa: enable pxa-pcm-audio on pxa210/pxa25x platform
ARM: pxa/colibri: don't register pxa2xx-pcmcia nodes on non-colibri platforms
ARM: pxa/tosa: drop setting LED trigger name, as it's unsupported now
ARM: 6762/1: Update number of VIC for S5P6442 and S5PC100
ARM: 6761/1: Update number of VIC for S5PV210
ARM: 6768/1: hw_breakpoint: ensure debug logic is powered up on v7 cores
ARM: 6767/1: ptrace: fix register indexing in GETHBPREGS request
ARM: 6765/1: remove obsolete comment from asm/mach/arch.h
ARM: 6757/1: fix tlb.h induced linux/swap.h build failure
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; |