6 files changed, 7 insertions, 45 deletions
diff --git a/etc/X11.alpha/xorg.conf b/etc/X11.alpha/xorg.conf
index 965e2ee52..50c41ff4c 100644
--- a/etc/X11.alpha/xorg.conf
+++ b/etc/X11.alpha/xorg.conf
@@ -1,48 +1,17 @@
-Section "ServerLayout"
-	Identifier     "TGA wsfb Config"
-	Screen      0  "Screen0" 0 0
-	InputDevice    "Mouse0" "CorePointer"
-	InputDevice    "Keyboard0" "CoreKeyboard"
-EndSection
-
-Section "Files"
-	FontPath     "/usr/X11R6/lib/X11/fonts/misc/"
-	FontPath     "/usr/X11R6/lib/X11/fonts/TTF/"
-	FontPath     "/usr/X11R6/lib/X11/fonts/OTF/"
-	FontPath     "/usr/X11R6/lib/X11/fonts/Type1/"
-	FontPath     "/usr/X11R6/lib/X11/fonts/75dpi/"
-EndSection
-
-Section "InputDevice"
-	Identifier  "Keyboard0"
-	Driver      "kbd"
-	Option	    "XkbRules"	"xorg"
-	Option	    "XkbModel"	"pc104"
-	Option	    "XkbLayout"	"us"
-EndSection
-
-Section "InputDevice"
-	Identifier  "Mouse0"
-	Driver      "mouse"
-	Option      "Protocol"	"wsmouse"
-	Option      "Device"	"/dev/wsmouse0"
-EndSection
-
-Section "Monitor"
-	Identifier   "Monitor"
-	VendorName   "Generic"
-EndSection
-
+#
+# Unaccelerated, TGA framebuffer configuration
+#
+# $OpenBSD: xorg.conf,v 1.3 2009/05/31 04:24:20 matthieu Exp $ 
+#
 Section "Device"
-	Identifier "Card0"
+	Identifier "Wsfb0"
 	Driver	   "wsfb"
 	Option	   "device" "/dev/ttyC0"
 EndSection
 
 Section "Screen"
 	Identifier "Screen0"
-	Device     "Card0"
-	Monitor    "Monitor"
+	Device     "Wsfb0"
 	SubSection "Display"
 		Depth     8
 	EndSubSection
diff --git a/etc/X11.hp300/xorg.conf b/etc/X11.hp300/xorg.conf
index 59ab647bf..d9a6bfa71 100644
--- a/etc/X11.hp300/xorg.conf
+++ b/etc/X11.hp300/xorg.conf
@@ -28,7 +28,6 @@ Section "InputDevice"
 	Option		"Protocol"	"standard"
 	Option		"XkbRules"	"xorg"
 	Option		"XkbModel"	"pc101"
-	Option		"XkbLayout"	"us"
 EndSection
 
 Section "InputDevice"
diff --git a/etc/X11.mac68k/xorg.conf b/etc/X11.mac68k/xorg.conf
index 983d757d5..558fc5030 100644
--- a/etc/X11.mac68k/xorg.conf
+++ b/etc/X11.mac68k/xorg.conf
@@ -28,7 +28,6 @@ Section "InputDevice"
 	Option		"Protocol"	"standard"
 	Option		"XkbRules"	"xorg"
 	Option		"XkbModel"	"pc101"
-	Option		"XkbLayout"	"us"
 EndSection
 
 Section "InputDevice"
diff --git a/etc/X11.macppc/xorg.conf b/etc/X11.macppc/xorg.conf
index b148fe514..200864135 100644
--- a/etc/X11.macppc/xorg.conf
+++ b/etc/X11.macppc/xorg.conf
@@ -19,7 +19,6 @@ Section "InputDevice"
 	Option	    "Protocol" 	  "standard"
 	Option	    "XkbRules" 	  "xorg"
 	Option	    "XkbModel" 	  "macintosh"
-	Option	    "XkbLayout"   "us"
 EndSection
 
 Section "InputDevice"
diff --git a/etc/X11.vax/xorg.conf b/etc/X11.vax/xorg.conf
index fa5580747..6e48e384c 100644
--- a/etc/X11.vax/xorg.conf
+++ b/etc/X11.vax/xorg.conf
@@ -20,7 +20,6 @@ Section "InputDevice"
 	Option		"Device"	"/dev/wskbd0"
 	Option		"XkbRules"	"xorg"
 	Option		"XkbModel"	"lk401"
-	Option		"XkbLayout"	"us"
 EndSection
 
 Section "InputDevice"
diff --git a/etc/X11.zaurus/xorg.conf b/etc/X11.zaurus/xorg.conf
index 234ca0f51..79e3d99d0 100644
--- a/etc/X11.zaurus/xorg.conf
+++ b/etc/X11.zaurus/xorg.conf
@@ -16,10 +16,7 @@ EndSection
 Section "InputDevice"
 	Identifier  "Keyboard0"
 	Driver      "kbd"
-	Option	    "Protocol" 	  "standard"
-	Option	    "XkbRules" 	  "xorg"
 	Option	    "XkbModel" 	  "zaurus"
-	Option	    "XkbLayout"   "us"
 EndSection
 
 Section "InputDevice"