diff options
| author | Jiang Liu <liuj97@gmail.com> | 2013-01-18 17:07:42 +0100 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-02-15 19:35:05 +0100 |
| commit | ab1a2e038ff2336502e95ec6492c0364a9fc70d0 (patch) | |
| tree | f69e59b53ed0b01eb4bc04c78ca5e38d2d5919ac /drivers/acpi/pci_slot.c | |
| parent | Merge branch 'acpi-scan' of git://git.kernel.org/pub/scm/linux/kernel/git/raf... (diff) | |
| download | linux-ab1a2e038ff2336502e95ec6492c0364a9fc70d0.tar.xz linux-ab1a2e038ff2336502e95ec6492c0364a9fc70d0.zip | |
ACPI / PCI: Make pci_slot built-in only, not a module
As discussed in thread at https://patchwork.kernel.org/patch/1946851/,
there's no value in supporting CONFIG_ACPI_PCI_SLOT=m any more.
So change Kconfig and code to only support building pci_slot as
built-in driver.
Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
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); |