Subject: Re: linux-next: build failure after merge of the omap_dss2 tree

From: Tomi Valkeinen <[email-masked]>
Date: Tue, 4 Mar 2014 08:58:31 +0200

On 04/03/14 05:35, Stephen Rothwell wrote:
> Hi Tomi,
> 
> After merging the omap_dss2 tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> In file included from drivers/staging/xgifb/XGIfb.h:3:0,
>                  from drivers/staging/xgifb/vb_init.c:4:
> drivers/staging/xgifb/vgatypes.h:5:38: fatal error: ../../video/sis/vgatypes.h: No such file or directory
>  #include "../../video/sis/vgatypes.h"
>                                       ^
> In file included from drivers/staging/xgifb/XGIfb.h:3:0,
>                  from drivers/staging/xgifb/vb_setmode.c:2:
> drivers/staging/xgifb/vgatypes.h:5:38: fatal error: ../../video/sis/vgatypes.h: No such file or directory
>  #include "../../video/sis/vgatypes.h"
>                                       ^
> In file included from drivers/staging/xgifb/vb_util.c:1:0:
> drivers/staging/xgifb/vgatypes.h:5:38: fatal error: ../../video/sis/vgatypes.h: No such file or directory
>  #include "../../video/sis/vgatypes.h"
>                                       ^
> In file included from drivers/staging/xgifb/XGIfb.h:3:0,
>                  from drivers/staging/xgifb/XGI_main.h:4,
>                  from drivers/staging/xgifb/XGI_main_26.c:16:
> drivers/staging/xgifb/vgatypes.h:5:38: fatal error: ../../video/sis/vgatypes.h: No such file or directory
>  #include "../../video/sis/vgatypes.h"
>                                       ^
> 
> Caused by commit 08667731d1d4 ("video: move fbdev to
> drivers/video/fbdev").
> 
> I have applied this merge fix patch (you should add it to your tree):

Thanks. I forgot we may have fbdev drivers in staging... This is now
fixed in my for-next branch (along with a couple of others, found by the
kbuild bot).

 Tomi