diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-02-15 17:44:01 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-02-15 17:44:01 -0700 |
| commit | ad06bff31fbf0aba4e5faae936e12292a7972b05 (patch) | |
| tree | 7a3f2a4da501c10e5821f6e1930a78572ce66d7c /drivers/acpi/pci_slot.c | |
| parent | 20f24208f631141bafe57ce5bcc8f2e7f3c41aae (diff) | |
| parent | ab1a2e038ff2336502e95ec6492c0364a9fc70d0 (diff) | |
| download | linux-stable-ad06bff31fbf0aba4e5faae936e12292a7972b05.tar.gz linux-stable-ad06bff31fbf0aba4e5faae936e12292a7972b05.tar.bz2 linux-stable-ad06bff31fbf0aba4e5faae936e12292a7972b05.zip | |
Merge branch 'pci/jiang-pci_slot-kconfig' into next
* pci/jiang-pci_slot-kconfig:
ACPI / PCI: Make pci_slot built-in only, not a module
Diffstat (limited to 'drivers/acpi/pci_slot.c')
| -rw-r--r-- | drivers/acpi/pci_slot.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/acpi/pci_slot.c b/drivers/acpi/pci_slot.c index d22585f21aeb..a7d7e7710f9e 100644 --- a/drivers/acpi/pci_slot.c +++ b/drivers/acpi/pci_slot.c @@ -330,19 +330,8 @@ static struct dmi_system_id acpi_pci_slot_dmi_table[] __initdata = { {} }; -static int __init -acpi_pci_slot_init(void) +void __init acpi_pci_slot_init(void) { dmi_check_system(acpi_pci_slot_dmi_table); acpi_pci_register_driver(&acpi_pci_slot_driver); - return 0; } - -static void __exit -acpi_pci_slot_exit(void) -{ - acpi_pci_unregister_driver(&acpi_pci_slot_driver); -} - -module_init(acpi_pci_slot_init); -module_exit(acpi_pci_slot_exit); |