equal
deleted
inserted
replaced
1 # Copyright 2007 Sun Microsystems, Inc. All rights reserved. |
1 # Copyright 2009 Sun Microsystems, Inc. All rights reserved. |
2 # Use subject to license terms. |
2 # Use is subject to license terms. |
3 # |
3 # |
4 # Permission is hereby granted, free of charge, to any person obtaining a |
4 # Permission is hereby granted, free of charge, to any person obtaining a |
5 # copy of this software and associated documentation files (the |
5 # copy of this software and associated documentation files (the |
6 # "Software"), to deal in the Software without restriction, including |
6 # "Software"), to deal in the Software without restriction, including |
7 # without limitation the rights to use, copy, modify, merge, publish, |
7 # without limitation the rights to use, copy, modify, merge, publish, |
25 # shall not be used in advertising or otherwise to promote the sale, use |
25 # shall not be used in advertising or otherwise to promote the sale, use |
26 # or other dealings in this Software without prior written authorization |
26 # or other dealings in this Software without prior written authorization |
27 # of the copyright holder. |
27 # of the copyright holder. |
28 |
28 |
29 diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c |
29 diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c |
30 --- hw/xfree86/common/xf86Config.c 2009-05-08 17:44:39.416143000 -0700 |
30 --- hw/xfree86/common/xf86Config.c 2009-11-03 22:29:03.988992847 -0800 |
31 +++ hw/xfree86/common/xf86Config.c 2009-05-08 17:44:47.430402000 -0700 |
31 +++ hw/xfree86/common/xf86Config.c 2009-11-03 22:29:05.439748324 -0800 |
32 @@ -532,11 +532,30 @@ fixup_video_driver_list(char **drivers) |
32 @@ -534,11 +534,30 @@ fixup_video_driver_list(char **drivers) |
33 if (!strcmp(*drv, "ati")) { |
33 if (!strcmp(*drv, "ati")) { |
34 ati = drv; |
34 ati = drv; |
35 x = *ati; *ati = *atimisc; *atimisc = x; |
35 x = *ati; *ati = *atimisc; *atimisc = x; |
36 - return; |
36 - return; |
37 + break; |
37 + break; |