Looks like we got a new declaration in the generic header... This fixes
compile but I don't know whether it's correct.
---
arch/powerpc/kernel/pci-common.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- linux-2.6-git.orig/arch/powerpc/kernel/pci-common.c 2007-07-17 19:11:57.519997066 +0200
+++ linux-2.6-git/arch/powerpc/kernel/pci-common.c 2007-07-17 19:12:14.820997066 +0200
@@ -156,10 +156,12 @@ static DEVICE_ATTR(devspec, S_IRUGO, pci
#endif /* CONFIG_PPC_OF */
/* Add sysfs properties */
-void pcibios_add_platform_entries(struct pci_dev *pdev)
+int pcibios_add_platform_entries(struct pci_dev *pdev)
{
#ifdef CONFIG_PPC_OF
- device_create_file(&pdev->dev, &dev_attr_devspec);
+ return device_create_file(&pdev->dev, &dev_attr_devspec);
+#else
+ return 0;
#endif /* CONFIG_PPC_OF */
}
On Wed, 2007-07-18 at 19:26 +0200, Johannes Berg wrote:
Looks like we got a new declaration in the generic header... This fixes
compile but I don't know whether it's correct.
We got a new declaration, along with updated C code in pci_64.c and
pci_32.c, but when that was merged with the creation of pci-common.c it
all went fubar.
Your patch is correct, but I think Tony has already sent it.
cheers
quoted hunk
--- linux-2.6-git.orig/arch/powerpc/kernel/pci-common.c 2007-07-17 19:11:57.519997066 +0200
+++ linux-2.6-git/arch/powerpc/kernel/pci-common.c 2007-07-17 19:12:14.820997066 +0200
@@ -156,10 +156,12 @@ static DEVICE_ATTR(devspec, S_IRUGO, pci
#endif /* CONFIG_PPC_OF */
/* Add sysfs properties */
-void pcibios_add_platform_entries(struct pci_dev *pdev)
+int pcibios_add_platform_entries(struct pci_dev *pdev)
{
#ifdef CONFIG_PPC_OF
- device_create_file(&pdev->dev, &dev_attr_devspec);
+ return device_create_file(&pdev->dev, &dev_attr_devspec);
+#else
+ return 0;
#endif /* CONFIG_PPC_OF */
}
--
Michael Ellerman
OzLabs, IBM Australia Development Lab
wwweb: http://michael.ellerman.id.au
phone: +61 2 6212 1183 (tie line 70 21183)
We do not inherit the earth from our ancestors,
we borrow it from our children. - S.M.A.R.T Person
On Thursday 19 July 2007, Michael Ellerman wrote:
Your patch is correct, but I think Tony has already sent it.
yes, it's already upstream as of Wed Jul 18 11:03:55 2007 +1000
Arnd <><