diff options
Diffstat (limited to 'drivers/pnp/pnpbios/core.c')
-rw-r--r-- | drivers/pnp/pnpbios/core.c | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c index 9892a6afe46..0691f473e9d 100644 --- a/drivers/pnp/pnpbios/core.c +++ b/drivers/pnp/pnpbios/core.c | |||
@@ -419,7 +419,6 @@ static void __init build_devlist(void) | |||
419 | static int pnpbios_disabled; | 419 | static int pnpbios_disabled; |
420 | int pnpbios_dont_use_current_config; | 420 | int pnpbios_dont_use_current_config; |
421 | 421 | ||
422 | #ifndef MODULE | ||
423 | static int __init pnpbios_setup(char *str) | 422 | static int __init pnpbios_setup(char *str) |
424 | { | 423 | { |
425 | int invert; | 424 | int invert; |
@@ -443,7 +442,6 @@ static int __init pnpbios_setup(char *str) | |||
443 | } | 442 | } |
444 | 443 | ||
445 | __setup("pnpbios=", pnpbios_setup); | 444 | __setup("pnpbios=", pnpbios_setup); |
446 | #endif | ||
447 | 445 | ||
448 | /* PnP BIOS signature: "$PnP" */ | 446 | /* PnP BIOS signature: "$PnP" */ |
449 | #define PNP_SIGNATURE (('$' << 0) + ('P' << 8) + ('n' << 16) + ('P' << 24)) | 447 | #define PNP_SIGNATURE (('$' << 0) + ('P' << 8) + ('n' << 16) + ('P' << 24)) |
@@ -607,48 +605,7 @@ static int __init pnpbios_thread_init(void) | |||
607 | return 0; | 605 | return 0; |
608 | } | 606 | } |
609 | 607 | ||
610 | #ifndef MODULE | ||
611 | |||
612 | /* init/main.c calls pnpbios_init early */ | ||
613 | |||
614 | /* Start the kernel thread later: */ | 608 | /* Start the kernel thread later: */ |
615 | module_init(pnpbios_thread_init); | 609 | module_init(pnpbios_thread_init); |
616 | 610 | ||
617 | #else | ||
618 | |||
619 | /* | ||
620 | * N.B.: Building pnpbios as a module hasn't been fully implemented | ||
621 | */ | ||
622 | |||
623 | MODULE_LICENSE("GPL"); | ||
624 | |||
625 | static int __init pnpbios_init_all(void) | ||
626 | { | ||
627 | int r; | ||
628 | |||
629 | r = pnpbios_init(); | ||
630 | if (r) | ||
631 | return r; | ||
632 | r = pnpbios_thread_init(); | ||
633 | if (r) | ||
634 | return r; | ||
635 | return 0; | ||
636 | } | ||
637 | |||
638 | static void __exit pnpbios_exit(void) | ||
639 | { | ||
640 | #ifdef CONFIG_HOTPLUG | ||
641 | unloading = 1; | ||
642 | wait_for_completion(&unload_sem); | ||
643 | #endif | ||
644 | pnpbios_proc_exit(); | ||
645 | /* We ought to free resources here */ | ||
646 | return; | ||
647 | } | ||
648 | |||
649 | module_init(pnpbios_init_all); | ||
650 | module_exit(pnpbios_exit); | ||
651 | |||
652 | #endif | ||
653 | |||
654 | EXPORT_SYMBOL(pnpbios_protocol); | 611 | EXPORT_SYMBOL(pnpbios_protocol); |