lkml.org 
[lkml]   [2014]   [May]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: linux-next: build failure after merge of the pci tree
On Thu, May 22, 2014 at 12:49 AM, Sebastian Ott
<sebott@linux.vnet.ibm.com> wrote:
> Hello,
>
> On Thu, 22 May 2014, Stephen Rothwell wrote:
>> Hi Bjorn,
>>
>> After merging the pci tree, today's linux-next build (arm
>> multi_v7_defconfig) failed like this:
>>
>> drivers/pci/pci-sysfs.c: In function 'devspec_show':
>> drivers/pci/pci-sysfs.c:426:22: error: dereferencing pointer to incomplete type
>> drivers/pci/pci-sysfs.c:428:30: error: dereferencing pointer to incomplete type
>> drivers/pci/pci-sysfs.c:429:1: warning: control reaches end of non-void function [-Wreturn-type]
>>
>> Caused by commit da647bb30834 ("PCI: Move Open Firmware devspec
>> attribute to PCI common code"). Presumably a forgotten include.
>>
>> I have used the pci tree from next-20140521 for today.
>
> Oops, sry for that one - this should fix it:
>
> pci: fix compile failure on arm
>
> Fix this compile error introduced by "PCI: Move Open Firmware
> devspec attribute to PCI common code":
>
> drivers/pci/pci-sysfs.c: In function 'devspec_show':
> drivers/pci/pci-sysfs.c:426:22: error: dereferencing pointer to incomplete type
> drivers/pci/pci-sysfs.c:428:30: error: dereferencing pointer to incomplete type
> drivers/pci/pci-sysfs.c:429:1: warning: control reaches end of non-void function [-Wreturn-type]
>
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>

I folded this in and updated my "next" branch, thanks!

> ---
> drivers/pci/pci-sysfs.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
> index 4e0acef..d6e61ae 100644
> --- a/drivers/pci/pci-sysfs.c
> +++ b/drivers/pci/pci-sysfs.c
> @@ -29,6 +29,7 @@
> #include <linux/slab.h>
> #include <linux/vgaarb.h>
> #include <linux/pm_runtime.h>
> +#include <linux/of.h>
> #include "pci.h"
>
> static int sysfs_initialized; /* = 0 */
> --
> 1.8.5.5
>


\
 
 \ /
  Last update: 2014-05-23 10:41    [W:0.047 / U:0.748 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site