Merge branch 'pci/jiang-pci_slot-kconfig' into next

	  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

	  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

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);

	{}

};

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);

	acpi_power_init();

	acpi_pci_root_init();

	acpi_pci_slot_init();

	/*

	 * Enumerate devices in the ACPI namespace.