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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 594 bytes --]

Hi Tomi,

After merging the omap_dss2 tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

drivers/video/ps3fb.c: In function 'ps3fb_mmap':
drivers/video/ps3fb.c:710:2: error: implicit declaration of function 'vm_ioremap_memory' [-Werror=implicit-function-declaration]
drivers/video/ps3fb.c:712:2: error: 'offset' undeclared (first use in this function)

Caused by commit 6ea19860d6c5 ("fbdev/ps3fb: use vm_iomap_memory()").

I have used the omap_dss2 tree from next-20130424 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Tomi Valkeinen]

[-- Attachment #1: Type: text/plain, Size: 2304 bytes --]

On 2013-04-26 08:10, Stephen Rothwell wrote:
> Hi Tomi,
> 
> After merging the omap_dss2 tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> drivers/video/ps3fb.c: In function 'ps3fb_mmap':
> drivers/video/ps3fb.c:710:2: error: implicit declaration of function 'vm_ioremap_memory' [-Werror=implicit-function-declaration]
> drivers/video/ps3fb.c:712:2: error: 'offset' undeclared (first use in this function)
> 
> Caused by commit 6ea19860d6c5 ("fbdev/ps3fb: use vm_iomap_memory()").
> 
> I have used the omap_dss2 tree from next-20130424 for today.
> 

Thanks. Updated patch below. I couldn't right away find where to download a
ppc64 toolchain, so not compile tested...

 Tomi


From 11bd5933abe033fb7a3a0d1f1bd2cb4b6df8143f Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Thu, 18 Apr 2013 07:52:42 +0300
Subject: [PATCH] fbdev/ps3fb: use vm_iomap_memory()

Use vm_iomap_memory() instead of [io_]remap_pfn_range().
vm_iomap_memory() gives us much simpler API to map memory to userspace,
and reduces possibilities for bugs.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
---
 drivers/video/ps3fb.c |   18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/drivers/video/ps3fb.c b/drivers/video/ps3fb.c
index 920c27b..d9f08c6 100644
--- a/drivers/video/ps3fb.c
+++ b/drivers/video/ps3fb.c
@@ -705,21 +705,15 @@ static int ps3fb_pan_display(struct fb_var_screeninfo *var,
 
 static int ps3fb_mmap(struct fb_info *info, struct vm_area_struct *vma)
 {
-	unsigned long size, offset;
+	int r;
 
-	size = vma->vm_end - vma->vm_start;
-	offset = vma->vm_pgoff << PAGE_SHIFT;
-	if (offset + size > info->fix.smem_len)
-		return -EINVAL;
-
-	offset += info->fix.smem_start;
-	if (remap_pfn_range(vma, vma->vm_start, offset >> PAGE_SHIFT,
-			    size, vma->vm_page_prot))
-		return -EAGAIN;
+	r = vm_iomap_memory(vma, info->fix.smem_start, info->fix.smem_len);
 
 	dev_dbg(info->device, "ps3fb: mmap framebuffer P(%lx)->V(%lx)\n",
-		offset, vma->vm_start);
-	return 0;
+		info->fix.smem_start + vma->vm_pgoff << PAGE_SHIFT,
+		vma->vm_start);
+
+	return r;
 }
 
     /*
-- 
1.7.10.4




[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 899 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 956 bytes --]

Hi Tomi,

On Fri, 26 Apr 2013 08:31:03 +0300 Tomi Valkeinen <tomi.valkeinen@ti.com> wrote:
>
> On 2013-04-26 08:10, Stephen Rothwell wrote:
> > 
> > After merging the omap_dss2 tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> > 
> > drivers/video/ps3fb.c: In function 'ps3fb_mmap':
> > drivers/video/ps3fb.c:710:2: error: implicit declaration of function 'vm_ioremap_memory' [-Werror=implicit-function-declaration]
> > drivers/video/ps3fb.c:712:2: error: 'offset' undeclared (first use in this function)
> > 
> > Caused by commit 6ea19860d6c5 ("fbdev/ps3fb: use vm_iomap_memory()").
> > 
> > I have used the omap_dss2 tree from next-20130424 for today.
> > 
> 
> Thanks. Updated patch below. I couldn't right away find where to download a
> ppc64 toolchain, so not compile tested...

https://www.kernel.org/pub/tools/crosstool/

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Tomi Valkeinen]

[-- Attachment #1: Type: text/plain, Size: 1027 bytes --]

On 2013-04-26 08:56, Stephen Rothwell wrote:
> Hi Tomi,
> 
> On Fri, 26 Apr 2013 08:31:03 +0300 Tomi Valkeinen <tomi.valkeinen@ti.com> wrote:
>>
>> On 2013-04-26 08:10, Stephen Rothwell wrote:
>>>
>>> After merging the omap_dss2 tree, today's linux-next build (powerpc
>>> ppc64_defconfig) failed like this:
>>>
>>> drivers/video/ps3fb.c: In function 'ps3fb_mmap':
>>> drivers/video/ps3fb.c:710:2: error: implicit declaration of function 'vm_ioremap_memory' [-Werror=implicit-function-declaration]
>>> drivers/video/ps3fb.c:712:2: error: 'offset' undeclared (first use in this function)
>>>
>>> Caused by commit 6ea19860d6c5 ("fbdev/ps3fb: use vm_iomap_memory()").
>>>
>>> I have used the omap_dss2 tree from next-20130424 for today.
>>>
>>
>> Thanks. Updated patch below. I couldn't right away find where to download a
>> ppc64 toolchain, so not compile tested...
> 
> https://www.kernel.org/pub/tools/crosstool/

Thanks. It compiles now. I've pushed new version to my for-next branch.

 Tomi




[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 899 bytes --]

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

[Tomi Valkeinen]

[-- Attachment #1: Type: text/plain, Size: 300 bytes --]

On 26/11/14 00:07, Stephen Rothwell wrote:

>>> So we need both CONFIG_OF and CONFIG_COMMON_CLK, the attached patch
>>> should fix this.
>>
>> Thanks, applied.
> 
> But not pushed out, yet?  Just checking that you haven't pushed on
> purpose.

Not yet. I'll be pushing today.

 Tomi



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1591 bytes --]

Hi Tomi,

On Tue, 25 Nov 2014 14:11:59 +0200 Tomi Valkeinen <tomi.valkeinen@ti.com> wrote:
>
> On 25/11/14 13:20, Hans de Goede wrote:
> > 
> > On 11/25/2014 12:00 PM, Tomi Valkeinen wrote:
> >> On 18/11/14 17:07, David Herrmann wrote:
> >>>
> >>> On Tue, Nov 18, 2014 at 3:53 PM, Tomi Valkeinen
> >>> <tomi.valkeinen@ti.com> wrote:
> >>>>
> >>>> Thanks Stephen!
> >>>>
> >>>> Hans, have you had a look at this? kbuild test bot also reported this.
> >>>
> >>> The fix from Stephen should not go to main-line. It breaks simplefb on
> >>> x86 without OF. Imo, linux/clk.h should provide a fallback if OF is
> >>> not defined (like it already does for of_clk_get() and friends).
> >>>
> >>> Hans, any comments?
> >>
> >> Hans, ping.
> > 
> > Sorry I somehow missed this thread so far, I did see the kbuild mail, but
> > it looked like a false positive to me, for the compile error case I
> > already fixed
> > in the last revision of the patch, adding #ifdef CONFIG_OF around the
> > offending code.
> > 
> > But on closer inspection I see that the entirety of linux/clk-provider.h
> > is wrapped
> > in one huge #ifdef CONFIG_COMMON_CLK and then later on also has:
> > 
> > #ifdef CONFIG_OF
> > ...
> > int of_clk_get_parent_count(struct device_node *np);
> > ...
> > #endif
> > 
> > So we need both CONFIG_OF and CONFIG_COMMON_CLK, the attached patch
> > should fix this.
> 
> Thanks, applied.

But not pushed out, yet?  Just checking that you haven't pushed on
purpose.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

[Tomi Valkeinen]

[-- Attachment #1: Type: text/plain, Size: 1303 bytes --]

On 25/11/14 13:20, Hans de Goede wrote:
> Hi Tomi,
> 
> On 11/25/2014 12:00 PM, Tomi Valkeinen wrote:
>> On 18/11/14 17:07, David Herrmann wrote:
>>> Hi
>>>
>>> On Tue, Nov 18, 2014 at 3:53 PM, Tomi Valkeinen
>>> <tomi.valkeinen@ti.com> wrote:
>>>> Hi,
>>>>
>>>> Thanks Stephen!
>>>>
>>>> Hans, have you had a look at this? kbuild test bot also reported this.
>>>
>>> The fix from Stephen should not go to main-line. It breaks simplefb on
>>> x86 without OF. Imo, linux/clk.h should provide a fallback if OF is
>>> not defined (like it already does for of_clk_get() and friends).
>>>
>>> Hans, any comments?
>>
>> Hans, ping.
> 
> Sorry I somehow missed this thread so far, I did see the kbuild mail, but
> it looked like a false positive to me, for the compile error case I
> already fixed
> in the last revision of the patch, adding #ifdef CONFIG_OF around the
> offending code.
> 
> But on closer inspection I see that the entirety of linux/clk-provider.h
> is wrapped
> in one huge #ifdef CONFIG_COMMON_CLK and then later on also has:
> 
> #ifdef CONFIG_OF
> ...
> int of_clk_get_parent_count(struct device_node *np);
> ...
> #endif
> 
> So we need both CONFIG_OF and CONFIG_COMMON_CLK, the attached patch
> should fix this.

Thanks, applied.

 Tomi



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

[Hans de Goede]

[-- Attachment #1: Type: text/plain, Size: 1140 bytes --]

Hi Tomi,

On 11/25/2014 12:00 PM, Tomi Valkeinen wrote:
> On 18/11/14 17:07, David Herrmann wrote:
>> Hi
>>
>> On Tue, Nov 18, 2014 at 3:53 PM, Tomi Valkeinen <tomi.valkeinen@ti.com> wrote:
>>> Hi,
>>>
>>> Thanks Stephen!
>>>
>>> Hans, have you had a look at this? kbuild test bot also reported this.
>>
>> The fix from Stephen should not go to main-line. It breaks simplefb on
>> x86 without OF. Imo, linux/clk.h should provide a fallback if OF is
>> not defined (like it already does for of_clk_get() and friends).
>>
>> Hans, any comments?
>
> Hans, ping.

Sorry I somehow missed this thread so far, I did see the kbuild mail, but
it looked like a false positive to me, for the compile error case I already fixed
in the last revision of the patch, adding #ifdef CONFIG_OF around the offending code.

But on closer inspection I see that the entirety of linux/clk-provider.h is wrapped
in one huge #ifdef CONFIG_COMMON_CLK and then later on also has:

#ifdef CONFIG_OF
...
int of_clk_get_parent_count(struct device_node *np);
...
#endif

So we need both CONFIG_OF and CONFIG_COMMON_CLK, the attached patch
should fix this.

Regards,

Hans

[-- Attachment #2: 0001-simplefb-Fix-build-errors-when-CONFIG_COMMON_CLK-is-.patch --]
[-- Type: text/x-patch, Size: 1027 bytes --]

>From 8ba38cd5ab635b67a50f8051ce2bdbcfa79253a2 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Tue, 25 Nov 2014 12:13:30 +0100
Subject: [PATCH v2] simplefb: Fix build errors when CONFIG_COMMON_CLK is not
 defined

Both CONFIG_OF and CONFIG_COMMON_CLK must be defined to be able to use of
clocks.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 drivers/video/fbdev/simplefb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/video/fbdev/simplefb.c b/drivers/video/fbdev/simplefb.c
index 8be9754..b2ae925 100644
--- a/drivers/video/fbdev/simplefb.c
+++ b/drivers/video/fbdev/simplefb.c
@@ -169,13 +169,13 @@ static int simplefb_parse_pd(struct platform_device *pdev,
 
 struct simplefb_par {
 	u32 palette[PSEUDO_PALETTE_SIZE];
-#ifdef CONFIG_OF
+#if defined CONFIG_OF && defined CONFIG_COMMON_CLK
 	int clk_count;
 	struct clk **clks;
 #endif
 };
 
-#ifdef CONFIG_OF
+#if defined CONFIG_OF && defined CONFIG_COMMON_CLK
 /*
  * Clock handling code.
  *
-- 
2.1.0

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

[Tomi Valkeinen]

[-- Attachment #1: Type: text/plain, Size: 517 bytes --]

On 18/11/14 17:07, David Herrmann wrote:
> Hi
> 
> On Tue, Nov 18, 2014 at 3:53 PM, Tomi Valkeinen <tomi.valkeinen@ti.com> wrote:
>> Hi,
>>
>> Thanks Stephen!
>>
>> Hans, have you had a look at this? kbuild test bot also reported this.
> 
> The fix from Stephen should not go to main-line. It breaks simplefb on
> x86 without OF. Imo, linux/clk.h should provide a fallback if OF is
> not defined (like it already does for of_clk_get() and friends).
> 
> Hans, any comments?

Hans, ping.

 Tomi



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

[David Herrmann]

Hi

On Tue, Nov 18, 2014 at 3:53 PM, Tomi Valkeinen <tomi.valkeinen@ti.com> wrote:
> Hi,
>
> Thanks Stephen!
>
> Hans, have you had a look at this? kbuild test bot also reported this.

The fix from Stephen should not go to main-line. It breaks simplefb on
x86 without OF. Imo, linux/clk.h should provide a fallback if OF is
not defined (like it already does for of_clk_get() and friends).

Hans, any comments?

Thanks
David

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

[Tomi Valkeinen]

[-- Attachment #1: Type: text/plain, Size: 1511 bytes --]

Hi,

Thanks Stephen!

Hans, have you had a look at this? kbuild test bot also reported this.

 Tomi

On 17/11/14 10:09, Stephen Rothwell wrote:
> Hi Tomi,
> 
> After merging the omap_dss2 tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/video/fbdev/simplefb.c: In function 'simplefb_clocks_init':
> drivers/video/fbdev/simplefb.c:207:2: error: implicit declaration of function 'of_clk_get_parent_count' [-Werror=implicit-function-declaration]
>   par->clk_count = of_clk_get_parent_count(np);
>   ^
> 
> Caused by commit fc219bfd5b2e ("simplefb: add clock handling code").
> This build does not have CONFIG_COMMON_CLK set.
> 
> I have added the following fix for today (there is probably a better
> one):
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 17 Nov 2014 19:05:42 +1100
> Subject: [PATCH] simplefb: make it depend on CONFIG_COMMON_CLK
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/video/fbdev/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
> index 025b439d4fe1..1f0298e166c3 100644
> --- a/drivers/video/fbdev/Kconfig
> +++ b/drivers/video/fbdev/Kconfig
> @@ -2457,6 +2457,7 @@ config FB_HYPERV
>  config FB_SIMPLE
>  	bool "Simple framebuffer support"
>  	depends on (FB = y)
> +	depends on COMMON_CLK
>  	select FB_CFB_FILLRECT
>  	select FB_CFB_COPYAREA
>  	select FB_CFB_IMAGEBLIT
> 



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1362 bytes --]

Hi Tomi,

After merging the omap_dss2 tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/video/fbdev/simplefb.c: In function 'simplefb_clocks_init':
drivers/video/fbdev/simplefb.c:207:2: error: implicit declaration of function 'of_clk_get_parent_count' [-Werror=implicit-function-declaration]
  par->clk_count = of_clk_get_parent_count(np);
  ^

Caused by commit fc219bfd5b2e ("simplefb: add clock handling code").
This build does not have CONFIG_COMMON_CLK set.

I have added the following fix for today (there is probably a better
one):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 17 Nov 2014 19:05:42 +1100
Subject: [PATCH] simplefb: make it depend on CONFIG_COMMON_CLK

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/video/fbdev/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
index 025b439d4fe1..1f0298e166c3 100644
--- a/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig
@@ -2457,6 +2457,7 @@ config FB_HYPERV
 config FB_SIMPLE
 	bool "Simple framebuffer support"
 	depends on (FB = y)
+	depends on COMMON_CLK
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
-- 
2.1.3

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

[Tomi Valkeinen]

[-- Attachment #1: Type: text/plain, Size: 630 bytes --]

On 05/03/14 05:32, Stephen Rothwell wrote:
> Hi Tomi,
> 
> After merging the omap_dss2 tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/video/fbdev/aty/mach64_cursor.c:8:24: fatal error: ../fb_draw.h: No such file or directory
>  #include "../fb_draw.h"
>                         ^
> 
> Caused by commit 236c52f2ad52 ("fbdev: move fbdev core files to separate directory").
> 
> I have used the omap_dss2 tree from next-20140304 for today.

Thanks. It was a bad merge between the main fbdev changes and the fbdev
restructuring. I've fixed it and pushed the branch.

 Tomi



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 901 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 495 bytes --]

Hi Tomi,

After merging the omap_dss2 tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/video/fbdev/aty/mach64_cursor.c:8:24: fatal error: ../fb_draw.h: No such file or directory
 #include "../fb_draw.h"
                        ^

Caused by commit 236c52f2ad52 ("fbdev: move fbdev core files to separate directory").

I have used the omap_dss2 tree from next-20140304 for today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Tomi Valkeinen]

[-- Attachment #1: Type: text/plain, Size: 1772 bytes --]

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



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 901 bytes --]

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

[Stephen Rothwell]

[-- 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 --]