diff options
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r-- | drivers/pcmcia/au1000_generic.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/pcmcia/au1000_generic.c b/drivers/pcmcia/au1000_generic.c index d90a634cebf5..ba48cef3a9dc 100644 --- a/drivers/pcmcia/au1000_generic.c +++ b/drivers/pcmcia/au1000_generic.c | |||
@@ -490,7 +490,7 @@ int au1x00_drv_pcmcia_remove(struct device *dev) | |||
490 | flush_scheduled_work(); | 490 | flush_scheduled_work(); |
491 | skt->ops->hw_shutdown(skt); | 491 | skt->ops->hw_shutdown(skt); |
492 | au1x00_pcmcia_config_skt(skt, &dead_socket); | 492 | au1x00_pcmcia_config_skt(skt, &dead_socket); |
493 | iounmap(skt->virt_io); | 493 | iounmap(skt->virt_io + (u32)mips_io_port_base); |
494 | skt->virt_io = NULL; | 494 | skt->virt_io = NULL; |
495 | } | 495 | } |
496 | 496 | ||
@@ -528,10 +528,6 @@ static struct device_driver au1x00_pcmcia_driver = { | |||
528 | .resume = pcmcia_socket_dev_resume, | 528 | .resume = pcmcia_socket_dev_resume, |
529 | }; | 529 | }; |
530 | 530 | ||
531 | static struct platform_device au1x00_device = { | ||
532 | .name = "au1x00-pcmcia", | ||
533 | .id = 0, | ||
534 | }; | ||
535 | 531 | ||
536 | /* au1x00_pcmcia_init() | 532 | /* au1x00_pcmcia_init() |
537 | * | 533 | * |
@@ -545,7 +541,6 @@ static int __init au1x00_pcmcia_init(void) | |||
545 | int error = 0; | 541 | int error = 0; |
546 | if ((error = driver_register(&au1x00_pcmcia_driver))) | 542 | if ((error = driver_register(&au1x00_pcmcia_driver))) |
547 | return error; | 543 | return error; |
548 | platform_device_register(&au1x00_device); | ||
549 | return error; | 544 | return error; |
550 | } | 545 | } |
551 | 546 | ||
@@ -556,7 +551,6 @@ static int __init au1x00_pcmcia_init(void) | |||
556 | static void __exit au1x00_pcmcia_exit(void) | 551 | static void __exit au1x00_pcmcia_exit(void) |
557 | { | 552 | { |
558 | driver_unregister(&au1x00_pcmcia_driver); | 553 | driver_unregister(&au1x00_pcmcia_driver); |
559 | platform_device_unregister(&au1x00_device); | ||
560 | } | 554 | } |
561 | 555 | ||
562 | module_init(au1x00_pcmcia_init); | 556 | module_init(au1x00_pcmcia_init); |