projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6
[powerpc.git]
/
drivers
/
pci
/
hotplug
/
shpchp.h
diff --git
a/drivers/pci/hotplug/shpchp.h
b/drivers/pci/hotplug/shpchp.h
index
fe4d653
..
b7d1c61
100644
(file)
--- a/
drivers/pci/hotplug/shpchp.h
+++ b/
drivers/pci/hotplug/shpchp.h
@@
-411,7
+411,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 {