diff options
| author | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-09-09 03:18:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-09-09 03:18:29 -0700 |
| commit | 8a0f08e246befbcbeef10c3df5f2efae308ef55f (patch) | |
| tree | d50c44cfcc986f4c77151a8898168bc4f734494d /drivers/hotplug/cpqphp_proc.c | |
| parent | 36b6ca012a1e8926525a8dd21eeb9c6ca46bd92b (diff) | |
| parent | 159b0104bdf27e5287a03c4660608eeb87d70c7c (diff) | |
Merge bk://linuxusb.bkbits.net/linus-2.5
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
Diffstat (limited to 'drivers/hotplug/cpqphp_proc.c')
| -rw-r--r-- | drivers/hotplug/cpqphp_proc.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/hotplug/cpqphp_proc.c b/drivers/hotplug/cpqphp_proc.c index 64b3461a6e20..8912f881664a 100644 --- a/drivers/hotplug/cpqphp_proc.c +++ b/drivers/hotplug/cpqphp_proc.c @@ -53,8 +53,9 @@ static int read_ctrl (char *buf, char **start, off_t offset, int len, int *eof, *eof = 1; out += sprintf(out, "hot plug ctrl Info Page\n"); - out += sprintf(out, "bus = %d, device = %d, function = %d\n",ctrl->bus, - ctrl->device, ctrl->function); + out += sprintf(out, "bus = %d, device = %d, function = %d\n", + ctrl->bus, PCI_SLOT(ctrl->pci_dev->devfn), + PCI_FUNC(ctrl->pci_dev->devfn)); out += sprintf(out, "Free resources: memory\n"); index = 11; res = ctrl->mem_head; @@ -104,8 +105,9 @@ static int read_dev (char *buf, char **start, off_t offset, int len, int *eof, v *eof = 1; out += sprintf(out, "hot plug ctrl Info Page\n"); - out += sprintf(out, "bus = %d, device = %d, function = %d\n",ctrl->bus, - ctrl->device, ctrl->function); + out += sprintf(out, "bus = %d, device = %d, function = %d\n", + ctrl->bus, PCI_SLOT(ctrl->pci_dev->devfn), + PCI_FUNC(ctrl->pci_dev->devfn)); slot=ctrl->slot; |