[or-cvs] r11534: Fix VESA fallback. (incognito/trunk/root_overlay/var/patches)

[double at seul.org]

Author: double
Date: 2007-09-20 11:57:38 -0400 (Thu, 20 Sep 2007)
New Revision: 11534

Modified:
   incognito/trunk/root_overlay/var/patches/xorg.conf.in.patch
Log:
Fix VESA fallback.


Modified: incognito/trunk/root_overlay/var/patches/xorg.conf.in.patch
===================================================================
--- incognito/trunk/root_overlay/var/patches/xorg.conf.in.patch	2007-09-20 07:19:23 UTC (rev 11533)
+++ incognito/trunk/root_overlay/var/patches/xorg.conf.in.patch	2007-09-20 15:57:38 UTC (rev 11534)
@@ -1,31 +1,15 @@
 --- etc/X11/xorg.conf.in.orig	2007-09-19 10:38:43.000000000 -0500
-+++ etc/X11/xorg.conf.in	2007-09-19 10:38:33.000000000 -0500
-@@ -1,5 +1,5 @@
++++ etc/X11/xorg.conf.in	2007-09-20 10:55:46.000000000 -0500
+@@ -1,6 +1,7 @@
  Section "ServerLayout"
 -	Identifier	"X.Org Configured"
-+	Identifier	"Card Specific"
++	Identifier	"Automatically Configured"
  	Screen	0	"Screen0" 0 0
++	Screen	0	"ScreenVesa" 0 0
  	InputDevice	"Keyboard0" "CoreKeyboard"
  	InputDevice	"PS/2 Mouse" "AlwaysCore"
-@@ -8,6 +8,17 @@
- 	InputDevice	"Synaptics" "AlwaysCore"
- EndSection
- 
-+Section "ServerLayout"
-+	Identifier	"VESA fall back"
-+	Screen	0	"ScreenVesa" 0 0
-+	InputDevice	"Keyboard0" "CoreKeyboard"
-+	InputDevice	"PS/2 Mouse" "AlwaysCore"
-+#	InputDevice	"Serial Mouse" "AlwaysCore"
-+	InputDevice	"USB Mouse" "AlwaysCore"
-+	InputDevice	"Synaptics" "AlwaysCore"
-+EndSection
-+
-+
- Section "ServerFlags"
- 	Option	"AllowMouseOpenFail" "true"
- 	@@NOPM@@
-@@ -85,6 +96,7 @@
+ #	InputDevice	"Serial Mouse" "AlwaysCore"
+@@ -85,6 +86,7 @@
  	Driver	"kbd"
  	Option	"CoreKeyboard"
  	Option	"XkbRules" "xorg"
@@ -33,7 +17,7 @@
  	Option	"XkbModel" "pc105"
  #	Option	"XkbOptions" "grp:toggle,grp_led:scroll"
  	Option	"XkbVariant" ",winkeys"
-@@ -163,6 +175,11 @@
+@@ -163,6 +165,11 @@
  #	BusID       "PCI:1:0:0"
  EndSection
  
@@ -45,7 +29,7 @@
  Section "Screen"
  	Identifier	"Screen0"
  	Device	"Card0"
-@@ -198,6 +215,41 @@
+@@ -198,6 +205,41 @@
  	EndSubSection
  EndSection