diff options
-rw-r--r-- | Documentation/feature-removal-schedule.txt | 12 | ||||
-rw-r--r-- | drivers/pci/probe.c | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index 3d849122b5b..dca11ea6d2d 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt | |||
@@ -551,3 +551,15 @@ When: 3.5 | |||
551 | Why: The iwlagn module has been renamed iwlwifi. The alias will be around | 551 | Why: The iwlagn module has been renamed iwlwifi. The alias will be around |
552 | for backward compatibility for several cycles and then dropped. | 552 | for backward compatibility for several cycles and then dropped. |
553 | Who: Don Fry <donald.h.fry@intel.com> | 553 | Who: Don Fry <donald.h.fry@intel.com> |
554 | |||
555 | ---------------------------- | ||
556 | |||
557 | What: pci_scan_bus_parented() | ||
558 | When: 3.5 | ||
559 | Why: The pci_scan_bus_parented() interface creates a new root bus. The | ||
560 | bus is created with default resources (ioport_resource and | ||
561 | iomem_resource) that are always wrong, so we rely on arch code to | ||
562 | correct them later. Callers of pci_scan_bus_parented() should | ||
563 | convert to using pci_scan_root_bus() so they can supply a list of | ||
564 | bus resources when the bus is created. | ||
565 | Who: Bjorn Helgaas <bhelgaas@google.com> | ||
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 04c2dc70927..944ea2170f4 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c | |||
@@ -1637,6 +1637,7 @@ struct pci_bus *pci_create_bus(struct device *parent, | |||
1637 | return b; | 1637 | return b; |
1638 | } | 1638 | } |
1639 | 1639 | ||
1640 | /* Deprecated; use pci_scan_root_bus() instead */ | ||
1640 | struct pci_bus * __devinit pci_scan_bus_parented(struct device *parent, | 1641 | struct pci_bus * __devinit pci_scan_bus_parented(struct device *parent, |
1641 | int bus, struct pci_ops *ops, void *sysdata) | 1642 | int bus, struct pci_ops *ops, void *sysdata) |
1642 | { | 1643 | { |