diff options
| author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-27 00:06:06 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-27 00:06:06 +0200 |
| commit | aef7b83c92dd0b7e994805440655d1d64147287b (patch) | |
| tree | 981f373358c1988e061625e8f272013065cb086f /arch/ppc/kernel/pci.c | |
| parent | [netdrvr] Fix register_netdev() races in older ISA net drivers (diff) | |
| parent | Merge 'drm-3264' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| download | linux-aef7b83c92dd0b7e994805440655d1d64147287b.tar.xz linux-aef7b83c92dd0b7e994805440655d1d64147287b.zip | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/ppc/kernel/pci.c')
| -rw-r--r-- | arch/ppc/kernel/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/kernel/pci.c b/arch/ppc/kernel/pci.c index 47a15306823a..6d7b92d72458 100644 --- a/arch/ppc/kernel/pci.c +++ b/arch/ppc/kernel/pci.c @@ -1003,7 +1003,7 @@ pci_create_OF_bus_map(void) } } -static ssize_t pci_show_devspec(struct device *dev, char *buf) +static ssize_t pci_show_devspec(struct device *dev, struct device_attribute *attr, char *buf) { struct pci_dev *pdev; struct device_node *np; |