From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Tomi Valkeinen <tomi.valkeinen@ti.com>, Greg KH <greg@kroah.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Aaro Koskinen <aaro.koskinen@iki.fi>,
Bill Pemberton <wfp5p@virginia.edu>
Subject: linux-next: build failure after merge of the omap_dss2 tree
Date: Tue, 4 Mar 2014 14:35:43 +1100 [thread overview]
Message-ID: <20140304143543.4ab2321f14a61d84bb63b692@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 3349 bytes --]
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@canb.auug.org.au>
Date: Tue, 4 Mar 2014 14:28:03 +1100
Subject: [PATCH] video: staging fixup for drivers movement
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
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@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-03-04 3:35 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-04 3:35 Stephen Rothwell [this message]
2014-03-04 6:58 ` linux-next: build failure after merge of the omap_dss2 tree Tomi Valkeinen
-- strict thread matches above, loose matches on Subject: below --
2014-11-17 8:09 Stephen Rothwell
2014-11-18 14:53 ` Tomi Valkeinen
2014-11-18 15:07 ` David Herrmann
2014-11-25 11:00 ` Tomi Valkeinen
2014-11-25 11:20 ` Hans de Goede
2014-11-25 12:11 ` Tomi Valkeinen
2014-11-25 22:07 ` Stephen Rothwell
2014-11-26 8:16 ` Tomi Valkeinen
2014-03-05 3:32 Stephen Rothwell
2014-03-05 7:01 ` Tomi Valkeinen
2013-04-26 5:10 Stephen Rothwell
2013-04-26 5:31 ` Tomi Valkeinen
2013-04-26 5:56 ` Stephen Rothwell
2013-04-26 6:57 ` Tomi Valkeinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140304143543.4ab2321f14a61d84bb63b692@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=aaro.koskinen@iki.fi \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=tomi.valkeinen@ti.com \
--cc=wfp5p@virginia.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).