Merge branch 'pci/hotplug-vga' into for-linus

Browse source

* pci/hotplug-vga:
  ACPIPHP / radeon / nouveau: Remove acpi_bus_no_hotplug()
  PCI: Add pci_ignore_hotplug() to ignore hotplug events for a device

...

This commit is contained in:

Bjorn Helgaas 2014-09-15 13:18:36 -06:00

parent fd7155fc9f f91ce35e47

commit 6de8eee17a

9 changed files with 31 additions and 51 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

10

drivers/acpi/bus.c

View file

16

drivers/gpu/drm/nouveau/nouveau_acpi.c

View file

1

drivers/gpu/drm/nouveau/nouveau_drm.c

View file

16

drivers/gpu/drm/radeon/radeon_atpx_handler.c

View file

1

drivers/gpu/drm/radeon/radeon_drv.c

View file

16

drivers/pci/hotplug/acpiphp_glue.c

View file

12

drivers/pci/hotplug/pciehp_hpc.c

View file

4

include/acpi/acpi_bus.h

View file

6

include/linux/pci.h

View file