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

Browse source

* pci/jiang-pci_slot-kconfig:
  ACPI / PCI: Make pci_slot built-in only, not a module

...

This commit is contained in:

Bjorn Helgaas 2013-02-15 17:44:01 -07:00

parent 20f24208f6 ab1a2e038f

commit ad06bff31f

4 changed files with 8 additions and 16 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

5

drivers/acpi/Kconfig

View file

5

drivers/acpi/internal.h

View file

13

drivers/acpi/pci_slot.c

View file

1

drivers/acpi/scan.c

View file