diff options
author | Linus Torvalds | 2005-06-21 01:00:33 +0200 |
---|---|---|
committer | Linus Torvalds | 2005-06-21 01:00:33 +0200 |
commit | 1d345dac1f30af1cd9f3a1faa12f9f18f17f236e (patch) | |
tree | 42a7deda7589edf704fe60dc262046755bd3f6a8 /arch/ppc64/kernel/pci.c | |
parent | Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
parent | [PATCH] PCI: fix show_modalias() function due to attribute change (diff) | |
download | kernel-qcow2-linux-1d345dac1f30af1cd9f3a1faa12f9f18f17f236e.tar.gz kernel-qcow2-linux-1d345dac1f30af1cd9f3a1faa12f9f18f17f236e.tar.xz kernel-qcow2-linux-1d345dac1f30af1cd9f3a1faa12f9f18f17f236e.zip |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
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, } #ifdef CONFIG_PPC_MULTIPLATFORM -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; |