public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] Fix compilation of atyfb
@ 2003-03-06  0:51 Ben Collins
  2003-03-06 10:09 ` Geert Uytterhoeven
  0 siblings, 1 reply; 3+ messages in thread
From: Ben Collins @ 2003-03-06  0:51 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: linux-kernel

I needed this patch in order for mach64 fb support to be compiled.

--- linux-2.5.64.orig/drivers/video/Makefile	2003-03-05 08:49:48.000000000 -0500
+++ linux-2.5.64/drivers/video/Makefile	2003-03-05 08:59:41.000000000 -0500
@@ -57,7 +57,7 @@
 obj-$(CONFIG_FB_MATROX)		  += matrox/
 obj-$(CONFIG_FB_RIVA)		  += riva/ cfbimgblt.o vgastate.o 
 obj-$(CONFIG_FB_SIS)		  += sis/
-obj-$(CONFIG_FB_ATY)		  += aty/ cfbimgblt.o cfbfillrect.o cfbimgblt.o
+obj-$(CONFIG_FB_ATY)		  += aty/ cfbimgblt.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
 obj-$(CONFIG_FB_I810)             += i810/ cfbfillrect.o cfbcopyarea.o \
 	                             cfbimgblt.o vgastate.o
 

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] Fix compilation of atyfb
  2003-03-06  0:51 [PATCH] Fix compilation of atyfb Ben Collins
@ 2003-03-06 10:09 ` Geert Uytterhoeven
  2003-03-06 15:27   ` James Simmons
  0 siblings, 1 reply; 3+ messages in thread
From: Geert Uytterhoeven @ 2003-03-06 10:09 UTC (permalink / raw)
  To: Ben Collins; +Cc: Linus Torvalds, Linux Kernel Development

On Wed, 5 Mar 2003, Ben Collins wrote:
> I needed this patch in order for mach64 fb support to be compiled.
> 
> --- linux-2.5.64.orig/drivers/video/Makefile	2003-03-05 08:49:48.000000000 -0500
> +++ linux-2.5.64/drivers/video/Makefile	2003-03-05 08:59:41.000000000 -0500
> @@ -57,7 +57,7 @@
>  obj-$(CONFIG_FB_MATROX)		  += matrox/
>  obj-$(CONFIG_FB_RIVA)		  += riva/ cfbimgblt.o vgastate.o 
>  obj-$(CONFIG_FB_SIS)		  += sis/
> -obj-$(CONFIG_FB_ATY)		  += aty/ cfbimgblt.o cfbfillrect.o cfbimgblt.o
> +obj-$(CONFIG_FB_ATY)		  += aty/ cfbimgblt.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
>  obj-$(CONFIG_FB_I810)             += i810/ cfbfillrect.o cfbcopyarea.o \
>  	                             cfbimgblt.o vgastate.o

While you're at it, better remove the duplicate cfbimgblt.o too:

--- linux-2.5.64/drivers/video/Makefile	Wed Mar  5 10:07:24 2003
+++ linux-m68k-2.5.64/drivers/video/Makefile	Wed Mar  5 11:57:44 2003
@@ -57,7 +57,7 @@
 obj-$(CONFIG_FB_MATROX)		  += matrox/
 obj-$(CONFIG_FB_RIVA)		  += riva/ cfbimgblt.o vgastate.o 
 obj-$(CONFIG_FB_SIS)		  += sis/
-obj-$(CONFIG_FB_ATY)		  += aty/ cfbimgblt.o cfbfillrect.o cfbimgblt.o
+obj-$(CONFIG_FB_ATY)		  += aty/ cfbfillrect.o cfbcopyarea.o cfbimgblt.o
 obj-$(CONFIG_FB_I810)             += i810/ cfbfillrect.o cfbcopyarea.o \
 	                             cfbimgblt.o vgastate.o
 
Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] Fix compilation of atyfb
  2003-03-06 10:09 ` Geert Uytterhoeven
@ 2003-03-06 15:27   ` James Simmons
  0 siblings, 0 replies; 3+ messages in thread
From: James Simmons @ 2003-03-06 15:27 UTC (permalink / raw)
  To: Geert Uytterhoeven; +Cc: Ben Collins, Linus Torvalds, Linux Kernel Development


I will be passing in the new fbdev code. I think it is time. It has this 
fix as well as others.

On Thu, 6 Mar 2003, Geert Uytterhoeven wrote:

> On Wed, 5 Mar 2003, Ben Collins wrote:
> > I needed this patch in order for mach64 fb support to be compiled.
> > 
> > --- linux-2.5.64.orig/drivers/video/Makefile	2003-03-05 08:49:48.000000000 -0500
> > +++ linux-2.5.64/drivers/video/Makefile	2003-03-05 08:59:41.000000000 -0500
> > @@ -57,7 +57,7 @@
> >  obj-$(CONFIG_FB_MATROX)		  += matrox/
> >  obj-$(CONFIG_FB_RIVA)		  += riva/ cfbimgblt.o vgastate.o 
> >  obj-$(CONFIG_FB_SIS)		  += sis/
> > -obj-$(CONFIG_FB_ATY)		  += aty/ cfbimgblt.o cfbfillrect.o cfbimgblt.o
> > +obj-$(CONFIG_FB_ATY)		  += aty/ cfbimgblt.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
> >  obj-$(CONFIG_FB_I810)             += i810/ cfbfillrect.o cfbcopyarea.o \
> >  	                             cfbimgblt.o vgastate.o
> 
> While you're at it, better remove the duplicate cfbimgblt.o too:
> 
> --- linux-2.5.64/drivers/video/Makefile	Wed Mar  5 10:07:24 2003
> +++ linux-m68k-2.5.64/drivers/video/Makefile	Wed Mar  5 11:57:44 2003
> @@ -57,7 +57,7 @@
>  obj-$(CONFIG_FB_MATROX)		  += matrox/
>  obj-$(CONFIG_FB_RIVA)		  += riva/ cfbimgblt.o vgastate.o 
>  obj-$(CONFIG_FB_SIS)		  += sis/
> -obj-$(CONFIG_FB_ATY)		  += aty/ cfbimgblt.o cfbfillrect.o cfbimgblt.o
> +obj-$(CONFIG_FB_ATY)		  += aty/ cfbfillrect.o cfbcopyarea.o cfbimgblt.o
>  obj-$(CONFIG_FB_I810)             += i810/ cfbfillrect.o cfbcopyarea.o \
>  	                             cfbimgblt.o vgastate.o
>  
> Gr{oetje,eeting}s,
> 
> 						Geert
> 
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
> 
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
> 							    -- Linus Torvalds
> 
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
> 


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2003-03-06 15:17 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2003-03-06  0:51 [PATCH] Fix compilation of atyfb Ben Collins
2003-03-06 10:09 ` Geert Uytterhoeven
2003-03-06 15:27   ` James Simmons

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox