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

[Stephen Rothwell]

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):

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Tue, 4 Mar 2014 14:28:03 +1100
Subject: [PATCH] video: staging fixup for drivers movement

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 drivers/staging/xgifb/vb_def.h    | 2 +-
 drivers/staging/xgifb/vb_struct.h | 2 +-
 drivers/staging/xgifb/vgatypes.h  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/xgifb/vb_def.h b/drivers/staging/xgifb/vb_def.h
index 5c739bebd8a5..949f0e5eed8d 100644
--- a/drivers/staging/xgifb/vb_def.h
+++ b/drivers/staging/xgifb/vb_def.h
@@ -1,6 +1,6 @@
 #ifndef _VB_DEF_
 #define _VB_DEF_
-#include "../../video/sis/initdef.h"
+#include "../../video/fbdev/sis/initdef.h"
 
 #define VB_XGI301C      0x0020 /* for 301C */
 
diff --git a/drivers/staging/xgifb/vb_struct.h b/drivers/staging/xgifb/vb_struct.h
index c08ff5b2d6ee..0d27594554ca 100644
--- a/drivers/staging/xgifb/vb_struct.h
+++ b/drivers/staging/xgifb/vb_struct.h
@@ -1,6 +1,6 @@
 #ifndef _VB_STRUCT_
 #define _VB_STRUCT_
-#include "../../video/sis/vstruct.h"
+#include "../../video/fbdev/sis/vstruct.h"
 
 struct XGI_LVDSCRT1HDataStruct {
 	unsigned char Reg[8];
diff --git a/drivers/staging/xgifb/vgatypes.h b/drivers/staging/xgifb/vgatypes.h
index ddf7776c295b..264351441f99 100644
--- a/drivers/staging/xgifb/vgatypes.h
+++ b/drivers/staging/xgifb/vgatypes.h
@@ -2,8 +2,8 @@
 #define _VGATYPES_
 
 #include <linux/fb.h>	/* for struct fb_var_screeninfo for sis.h */
-#include "../../video/sis/vgatypes.h"
-#include "../../video/sis/sis.h"		/* for LCD_TYPE */
+#include "../../video/fbdev/sis/vgatypes.h"
+#include "../../video/fbdev/sis/sis.h"		/* for LCD_TYPE */
 
 #ifndef XGI_VB_CHIP_TYPE
 enum XGI_VB_CHIP_TYPE {
-- 
1.9.0

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgprmomW05ODI.pgp
Description: PGP signature