Commit ad06bff3 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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
parents 20f24208 ab1a2e03

drivers/acpi/Kconfig

+1 −4
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ config ACPI_DEBUG_FUNC_TRACE 
	  is about half of the penalty and is rarely useful.



config ACPI_PCI_SLOT

	tristate "PCI slot detection driver"

	bool "PCI slot detection driver"

	depends on SYSFS

	default n

	help
@@ -317,9 +317,6 @@ config ACPI_PCI_SLOT 
	  i.e., segment/bus/device/function tuples, with physical slots in

	  the system.  If you are unsure, say N.



	  To compile this driver as a module, choose M here:

	  the module will be called pci_slot.



config X86_PM_TIMER

	bool "Power Management Timer Support" if EXPERT

	depends on X86

drivers/acpi/internal.h

+5 −0
Original line number Diff line number Diff line
@@ -67,6 +67,11 @@ struct acpi_ec { 


extern struct acpi_ec *first_ec;



#ifdef	CONFIG_ACPI_PCI_SLOT

void acpi_pci_slot_init(void);

#else

static inline void acpi_pci_slot_init(void) { }

#endif

int acpi_pci_root_init(void);

void acpi_pci_root_hp_init(void);

int acpi_ec_init(void);

drivers/acpi/pci_slot.c

+1 −12
Original line number Diff line number Diff line
@@ -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);

drivers/acpi/scan.c

+1 −0
Original line number Diff line number Diff line
@@ -1687,6 +1687,7 @@ int __init acpi_scan_init(void) 


	acpi_power_init();

	acpi_pci_root_init();

	acpi_pci_slot_init();



	/*

	 * Enumerate devices in the ACPI namespace.