diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2006-05-19 02:53:11 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-05-24 02:08:56 -0400 |
commit | efbd386967aaa7fcf7ffbb13e4975df1cdf04cb8 (patch) | |
tree | 22e60f8e821e5ef616b69dac404003cb70e3cbaf /arch/powerpc/kernel/pci_64.c | |
parent | 403fac4f83bd8e089a192c542511fbeb2729a6c5 (diff) |
[PATCH] powerpc: iSeries PCI devices can now have a devpsec attribute
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/pci_64.c')
-rw-r--r-- | arch/powerpc/kernel/pci_64.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c index e1b3b3ef1912..30a4e6a1368a 100644 --- a/arch/powerpc/kernel/pci_64.c +++ b/arch/powerpc/kernel/pci_64.c | |||
@@ -886,8 +886,8 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, | |||
886 | return ret; | 886 | return ret; |
887 | } | 887 | } |
888 | 888 | ||
889 | #ifdef CONFIG_PPC_MULTIPLATFORM | 889 | static ssize_t pci_show_devspec(struct device *dev, |
890 | static ssize_t pci_show_devspec(struct device *dev, struct device_attribute *attr, char *buf) | 890 | struct device_attribute *attr, char *buf) |
891 | { | 891 | { |
892 | struct pci_dev *pdev; | 892 | struct pci_dev *pdev; |
893 | struct device_node *np; | 893 | struct device_node *np; |
@@ -899,13 +899,10 @@ static ssize_t pci_show_devspec(struct device *dev, struct device_attribute *att | |||
899 | return sprintf(buf, "%s", np->full_name); | 899 | return sprintf(buf, "%s", np->full_name); |
900 | } | 900 | } |
901 | static DEVICE_ATTR(devspec, S_IRUGO, pci_show_devspec, NULL); | 901 | static DEVICE_ATTR(devspec, S_IRUGO, pci_show_devspec, NULL); |
902 | #endif /* CONFIG_PPC_MULTIPLATFORM */ | ||
903 | 902 | ||
904 | void pcibios_add_platform_entries(struct pci_dev *pdev) | 903 | void pcibios_add_platform_entries(struct pci_dev *pdev) |
905 | { | 904 | { |
906 | #ifdef CONFIG_PPC_MULTIPLATFORM | ||
907 | device_create_file(&pdev->dev, &dev_attr_devspec); | 905 | device_create_file(&pdev->dev, &dev_attr_devspec); |
908 | #endif /* CONFIG_PPC_MULTIPLATFORM */ | ||
909 | } | 906 | } |
910 | 907 | ||
911 | #ifdef CONFIG_PPC_MULTIPLATFORM | 908 | #ifdef CONFIG_PPC_MULTIPLATFORM |