Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 362879
b: refs/heads/master
c: 8901650
h: refs/heads/master
i:
  362877: 3b074a6
  362875: 281163c
  362871: 3b27d6c
  362863: e612bbc
  362847: 47f78a3
  362815: 8026b17
  362751: 9fc882b
v: v3
  • Loading branch information
Jiang Liu authored and Bjorn Helgaas committed Apr 12, 2013
1 parent 06e3ca3 commit 14cfcf7
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b02a4a193420890fdf0d1285cfb9a92e416dcd5c
refs/heads/master: 89016506b62a79766c091959ecb40ec666f381bc
11 changes: 11 additions & 0 deletions trunk/arch/x86/pci/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

#include <linux/sched.h>
#include <linux/pci.h>
#include <linux/pci-acpi.h>
#include <linux/ioport.h>
#include <linux/init.h>
#include <linux/dmi.h>
Expand Down Expand Up @@ -170,6 +171,16 @@ void pcibios_fixup_bus(struct pci_bus *b)
pcibios_fixup_device_resources(dev);
}

void pcibios_add_bus(struct pci_bus *bus)
{
acpi_pci_add_bus(bus);
}

void pcibios_remove_bus(struct pci_bus *bus)
{
acpi_pci_remove_bus(bus);
}

/*
* Only use DMI information to set this if nothing was passed
* on the kernel command line (which was parsed earlier).
Expand Down

0 comments on commit 14cfcf7

Please sign in to comment.