diff options
author | Mike Rapoport <mike@compulab.co.il> | 2008-10-05 05:27:22 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-07 07:08:02 -0400 |
commit | 8616e2fb6930103a8408998777ec8a2332f5e89d (patch) | |
tree | 4701da5b57b8aad1f9e3d0b42ff261a0bcfd3f60 /drivers/pcmcia/pxa2xx_cm_x270.c | |
parent | a7f3f0309b68d8d07a97a54c492802c294bccacd (diff) |
[ARM] 5283/1: pxa: add CM-X255 pcmcia support
Signed-off-by: Russ Dill <russ.dill@gmail.com>
Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/pcmcia/pxa2xx_cm_x270.c')
-rw-r--r-- | drivers/pcmcia/pxa2xx_cm_x270.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/pcmcia/pxa2xx_cm_x270.c b/drivers/pcmcia/pxa2xx_cm_x270.c index bcff5cfed051..6c3aac377126 100644 --- a/drivers/pcmcia/pxa2xx_cm_x270.c +++ b/drivers/pcmcia/pxa2xx_cm_x270.c | |||
@@ -105,13 +105,10 @@ static struct pcmcia_low_level cmx270_pcmcia_ops __initdata = { | |||
105 | 105 | ||
106 | static struct platform_device *cmx270_pcmcia_device; | 106 | static struct platform_device *cmx270_pcmcia_device; |
107 | 107 | ||
108 | static int __init cmx270_pcmcia_init(void) | 108 | int __init cmx270_pcmcia_init(void) |
109 | { | 109 | { |
110 | int ret; | 110 | int ret; |
111 | 111 | ||
112 | if (!machine_is_armcore()) | ||
113 | return -ENODEV; | ||
114 | |||
115 | cmx270_pcmcia_device = platform_device_alloc("pxa2xx-pcmcia", -1); | 112 | cmx270_pcmcia_device = platform_device_alloc("pxa2xx-pcmcia", -1); |
116 | 113 | ||
117 | if (!cmx270_pcmcia_device) | 114 | if (!cmx270_pcmcia_device) |
@@ -131,14 +128,7 @@ static int __init cmx270_pcmcia_init(void) | |||
131 | return ret; | 128 | return ret; |
132 | } | 129 | } |
133 | 130 | ||
134 | static void __exit cmx270_pcmcia_exit(void) | 131 | void __exit cmx270_pcmcia_exit(void) |
135 | { | 132 | { |
136 | platform_device_unregister(cmx270_pcmcia_device); | 133 | platform_device_unregister(cmx270_pcmcia_device); |
137 | } | 134 | } |
138 | |||
139 | module_init(cmx270_pcmcia_init); | ||
140 | module_exit(cmx270_pcmcia_exit); | ||
141 | |||
142 | MODULE_LICENSE("GPL"); | ||
143 | MODULE_AUTHOR("Mike Rapoport <mike@compulab.co.il>"); | ||
144 | MODULE_DESCRIPTION("CM-x270 PCMCIA driver"); | ||