diff options
| author | Jaroslav Kysela <perex@hera.kernel.org> | 2005-06-21 10:39:41 -0400 |
|---|---|---|
| committer | Jaroslav Kysela <perex@hera.kernel.org> | 2005-06-21 10:39:41 -0400 |
| commit | fae6ec69c84d71b1d5bda9ede1a262c1681684aa (patch) | |
| tree | eb4aff9a5c2b7d04ce09a3717bb1dd4a79fe7595 /arch/ppc64/kernel/pci.c | |
| parent | bbc0274e9bb2e3f1d724d445a2bd32566b9b66f7 (diff) | |
| parent | 1d345dac1f30af1cd9f3a1faa12f9f18f17f236e (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/ppc64/kernel/pci.c')
| -rw-r--r-- | arch/ppc64/kernel/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc64/kernel/pci.c b/arch/ppc64/kernel/pci.c index d786d4b6af0b..2bf0513f3eca 100644 --- a/arch/ppc64/kernel/pci.c +++ b/arch/ppc64/kernel/pci.c | |||
| @@ -507,7 +507,7 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, | |||
| 507 | } | 507 | } |
| 508 | 508 | ||
| 509 | #ifdef CONFIG_PPC_MULTIPLATFORM | 509 | #ifdef CONFIG_PPC_MULTIPLATFORM |
| 510 | static ssize_t pci_show_devspec(struct device *dev, char *buf) | 510 | static ssize_t pci_show_devspec(struct device *dev, struct device_attribute *attr, char *buf) |
| 511 | { | 511 | { |
| 512 | struct pci_dev *pdev; | 512 | struct pci_dev *pdev; |
| 513 | struct device_node *np; | 513 | struct device_node *np; |