Re: 2.6.13-mm1: broken drivers/video/sis/Makefile

Thomas Winischhofer
2005-09-01T23:25:42Z

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

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Adrian Bunk wrote:
> On Thu, Sep 01, 2005 at 03:55:42AM -0700, Andrew Morton wrote:
>
>>...
>>Changes since 2.6.13-rc6-mm2:
>>...
>>+sisfb-update.patch
>>...
>> fbdev updates
>>...
>
>
> This patch accidentally replaces drivers/video/sis/Makefile with a
> toplevel Makefile.

ARGH..... that happens if you work with four trees at the same time...

My appologies. Correct Makefile-patch attached.

Thomas

- --
Thomas Winischhofer
Vienna/Austria
thomas AT winischhofer DOT net *** http://www.winischhofer.net
twini AT xfree86 DOT org
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)

iD8DBQFDF43FzydIRAktyUcRAptjAKDPQeYc3v5Ulu+HKnbRINsCNcfwwgCgkWnD
sJnT86TfSyX45JIW2KKRLog=
=TDOr
-----END PGP SIGNATURE-----

[-- Attachment #2: sisfb_mf_patch.diff --]
[-- Type: text/plain, Size: 347 bytes --]

--- linux-2.6.13-orig/drivers/video/sis/Makefile 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.13-sisfb/drivers/video/sis/Makefile 2005-09-02 01:22:29.247255624 +0200
@@ -4,4 +4,4 @@

obj-$(CONFIG_FB_SIS) += sisfb.o

-sisfb-objs := sis_main.o sis_accel.o init.o init301.o
+sisfb-objs := sis_main.o sis_accel.o init.o init301.o initextlfb.o