aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2008-04-15 17:34:34 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-15 22:35:40 -0400
commit12c2c019eb9b0b586a061b336766d11cca449499 (patch)
tree7a0c3a4042271375292bdd90dcb97d446205322b
parentd6c238503ee3d015c5f8a701b2bfbeaad90a6d4b (diff)
pcmcia: fix platform driver hotplug/coldplug
Since 43cc71eed1250755986da4c0f9898f9a635cb3bf, the platform modalias is prefixed with "platform:". Add MODULE_ALIAS() to the hotpluggable PCMCIA platform drivers, to re-enable auto loading. [dbrownell@users.sourceforge.net: registration fixes] Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/pcmcia/at91_cf.c1
-rw-r--r--drivers/pcmcia/omap_cf.c2
-rw-r--r--drivers/pcmcia/pxa2xx_base.c2
3 files changed, 5 insertions, 0 deletions
diff --git a/drivers/pcmcia/at91_cf.c b/drivers/pcmcia/at91_cf.c
index 385e145e1acc..684968558c19 100644
--- a/drivers/pcmcia/at91_cf.c
+++ b/drivers/pcmcia/at91_cf.c
@@ -419,3 +419,4 @@ module_exit(at91_cf_exit);
419MODULE_DESCRIPTION("AT91 Compact Flash Driver"); 419MODULE_DESCRIPTION("AT91 Compact Flash Driver");
420MODULE_AUTHOR("David Brownell"); 420MODULE_AUTHOR("David Brownell");
421MODULE_LICENSE("GPL"); 421MODULE_LICENSE("GPL");
422MODULE_ALIAS("platform:at91_cf");
diff --git a/drivers/pcmcia/omap_cf.c b/drivers/pcmcia/omap_cf.c
index 2df216b00817..bb6db3a582b2 100644
--- a/drivers/pcmcia/omap_cf.c
+++ b/drivers/pcmcia/omap_cf.c
@@ -344,6 +344,7 @@ static int omap_cf_resume(struct platform_device *pdev)
344static struct platform_driver omap_cf_driver = { 344static struct platform_driver omap_cf_driver = {
345 .driver = { 345 .driver = {
346 .name = (char *) driver_name, 346 .name = (char *) driver_name,
347 .owner = THIS_MODULE,
347 }, 348 },
348 .remove = __exit_p(omap_cf_remove), 349 .remove = __exit_p(omap_cf_remove),
349 .suspend = omap_cf_suspend, 350 .suspend = omap_cf_suspend,
@@ -368,3 +369,4 @@ module_exit(omap_cf_exit);
368 369
369MODULE_DESCRIPTION("OMAP CF Driver"); 370MODULE_DESCRIPTION("OMAP CF Driver");
370MODULE_LICENSE("GPL"); 371MODULE_LICENSE("GPL");
372MODULE_ALIAS("platform:omap_cf");
diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c
index e439044d88f2..9414163c78e7 100644
--- a/drivers/pcmcia/pxa2xx_base.c
+++ b/drivers/pcmcia/pxa2xx_base.c
@@ -239,6 +239,7 @@ static struct platform_driver pxa2xx_pcmcia_driver = {
239 .resume = pxa2xx_drv_pcmcia_resume, 239 .resume = pxa2xx_drv_pcmcia_resume,
240 .driver = { 240 .driver = {
241 .name = "pxa2xx-pcmcia", 241 .name = "pxa2xx-pcmcia",
242 .owner = THIS_MODULE,
242 }, 243 },
243}; 244};
244 245
@@ -258,3 +259,4 @@ module_exit(pxa2xx_pcmcia_exit);
258MODULE_AUTHOR("Stefan Eletzhofer <stefan.eletzhofer@inquant.de> and Ian Molton <spyro@f2s.com>"); 259MODULE_AUTHOR("Stefan Eletzhofer <stefan.eletzhofer@inquant.de> and Ian Molton <spyro@f2s.com>");
259MODULE_DESCRIPTION("Linux PCMCIA Card Services: PXA2xx core socket driver"); 260MODULE_DESCRIPTION("Linux PCMCIA Card Services: PXA2xx core socket driver");
260MODULE_LICENSE("GPL"); 261MODULE_LICENSE("GPL");
262MODULE_ALIAS("platform:pxa2xx-pcmcia");