here is the additional cleanup patch removing the obsolete function chooseVideoDriver I had left this in in the first patch to keep the diff readable.
commit 05b821fbd75bd83c7e60e0e249715d744e901ed5 Author: Ruediger Oertel <[email protected]> Date: Mon Mar 29 00:20:32 2010 +0200 remove now obsolete function chooseVideoDriver diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c index 56f7deb..7b836b0 100644 --- a/hw/xfree86/common/xf86AutoConfig.c +++ b/hw/xfree86/common/xf86AutoConfig.c @@ -522,31 +522,6 @@ listPossibleVideoDrivers(char *matches[], int nmatches) } } -static char* -chooseVideoDriver(void) -{ - char *chosen_driver = NULL; - int i; - char *matches[20]; /* If we have more than 20 drivers we're in trouble */ - - listPossibleVideoDrivers(matches, 20); - - /* TODO Handle multiple drivers claiming to support the same PCI ID */ - chosen_driver = matches[0]; - - xf86Msg(X_DEFAULT, "Matched %s for the autoconfigured driver\n", - chosen_driver); - - for (i = 0; matches[i] ; i++) { - if (matches[i] != chosen_driver) { - xfree(matches[i]); - } - } - - return chosen_driver; -} - - /* copy a screen section and enter the desired driver * and insert it at i in the list of screens */ static Bool -- with kind regards (mit freundlichem Grinsen), Ruediger Oertel ([email protected],[email protected],[email protected]) ---------------------------------------------------------------------- Linux MacBookRudi.suse.de 2.6.33-6-desktop #1 SMP PREEMPT 2010-02-25 20:06:12 +0100 x86_64 Key fingerprint = 17DC 6553 86A7 384B 53C5 CA5C 3CE4 F2E7 23F2 B417 SUSE LINUX Products GmbH, GF: Markus Rex, HRB 16746 (AG Nürnberg) _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
