From bd64ffdd62e12f44be8ba444313b03b4390ca1c2 Mon Sep 17 00:00:00 2001 From: "akpm@linux-foundation.org" Date: Tue, 3 Feb 2009 15:45:26 -0800 Subject: [PATCH] --- yaml --- r: 139335 b: refs/heads/master c: c48f1670f42b71f39f4a3bfba01ffb691cc9206c h: refs/heads/master i: 139333: d5942d1acd7a3ff8e8ee73e6da08d570bab75f79 139331: 6de941a2c8deef4efc23272f86c34a4533825f17 139327: f297020a379989b69abb69896db992978f4dd0b2 v: v3 --- [refs] | 2 +- trunk/drivers/pci/bus.c | 2 +- trunk/include/linux/pci.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7a82c33a5b3f..89d435e22391 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b5fbf53324f65646154e172af350674d5a2a1629 +refs/heads/master: c48f1670f42b71f39f4a3bfba01ffb691cc9206c diff --git a/trunk/drivers/pci/bus.c b/trunk/drivers/pci/bus.c index 52b54f053be0..118c77778d29 100644 --- a/trunk/drivers/pci/bus.c +++ b/trunk/drivers/pci/bus.c @@ -133,7 +133,7 @@ int pci_bus_add_child(struct pci_bus *bus) * * Call hotplug for each new devices. */ -void pci_bus_add_devices(struct pci_bus *bus) +void pci_bus_add_devices(const struct pci_bus *bus) { struct pci_dev *dev; struct pci_bus *child; diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h index b5d6d0e0f1cb..a1af2fe00639 100644 --- a/trunk/include/linux/pci.h +++ b/trunk/include/linux/pci.h @@ -528,7 +528,7 @@ void pcibios_update_irq(struct pci_dev *, int irq); /* Generic PCI functions used internally */ extern struct pci_bus *pci_find_bus(int domain, int busnr); -void pci_bus_add_devices(struct pci_bus *bus); +void pci_bus_add_devices(const struct pci_bus *bus); struct pci_bus *pci_scan_bus_parented(struct device *parent, int bus, struct pci_ops *ops, void *sysdata); static inline struct pci_bus * __devinit pci_scan_bus(int bus, struct pci_ops *ops,