aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/hotplug/pciehp.h
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@hera.kernel.org>2005-09-09 08:19:10 -0700
committerAnton Altaparmakov <aia21@hera.kernel.org>2005-09-09 08:19:10 -0700
commitddcc95963449d028b16d9b9fe50f6e91ce7d9e81 (patch)
treeaaf0392346a18b3e232ddeb5db3c4e917f7ca686 /drivers/pci/hotplug/pciehp.h
parentMerge branch 'master' of /usr/src/linux-2.6 (diff)
parentMerge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev (diff)
downloadlinux-dev-ddcc95963449d028b16d9b9fe50f6e91ce7d9e81.tar.xz
linux-dev-ddcc95963449d028b16d9b9fe50f6e91ce7d9e81.zip
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/pci/hotplug/pciehp.h')
-rw-r--r--drivers/pci/hotplug/pciehp.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index 2b92b9e8c910..061ead21ef14 100644
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
@@ -302,7 +302,7 @@ static inline void return_resource(struct pci_resource **head, struct pci_resour
static inline void make_slot_name(char *buffer, int buffer_size, struct slot *slot)
{
- snprintf(buffer, buffer_size, "%d", slot->number);
+ snprintf(buffer, buffer_size, "%04d_%04d", slot->bus, slot->number);
}
enum php_ctlr_type {