diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-21 19:21:20 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-21 19:21:20 -0400 |
| commit | 29516d75a0b09e0a0328dd55c98a342515c9615a (patch) | |
| tree | 4b03326311958ad6de82653a1caf289ad8c38538 /arch/ppc/kernel/pci.c | |
| parent | 4ea78729b8dbfc400fe165a57b90a394a7275a54 (diff) | |
| parent | 4a4f8fdba6f5a34ca90f426021e17491a30202da (diff) | |
Auto merge with /home/aegl/GIT/linus
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) | |||
| 1003 | } | 1003 | } |
| 1004 | } | 1004 | } |
| 1005 | 1005 | ||
| 1006 | static ssize_t pci_show_devspec(struct device *dev, char *buf) | 1006 | static ssize_t pci_show_devspec(struct device *dev, struct device_attribute *attr, char *buf) |
| 1007 | { | 1007 | { |
| 1008 | struct pci_dev *pdev; | 1008 | struct pci_dev *pdev; |
| 1009 | struct device_node *np; | 1009 | struct device_node *np; |