xserver-xf86-config: Clean up xorg conf file

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

2 files changed, 7 insertions, 67 deletions

diff --git a/meta/packages/xorg-xserver/xserver-xf86-config/xorg.conf b/meta/packages/xorg-xserver/xserver-xf86-config/xorg.conf
index 5e5a79b6f3..0827e26bae 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-config/xorg.conf
+++ b/meta/packages/xorg-xserver/xserver-xf86-config/xorg.conf
@@ -1,63 +1,7 @@
 
-Section "Files"
-EndSection
-
-Section "InputDevice"
-    Identifier    "Generic Keyboard"
-    Driver        "kbd"
-    Option        "CoreKeyboard"
-    Option        "XkbRules"    "xorg"
-    Option        "XkbModel"    "pc105"
-    Option        "XkbLayout"    "us"
-EndSection
-
-Section "InputDevice"
-    Identifier    "Configured Mouse"
-    Driver        "mouse"
-    Option        "CorePointer"
-    Option        "Device"        "/dev/input/mice"
-    Option        "Protocol"        "ImPS/2"
-    Option        "ZAxisMapping"        "4 5"
-    Option        "Emulate3Buttons"    "true"
-EndSection
-
-Section "InputDevice"
-    Identifier    "Synaptics Touchpad"
-    Driver        "synaptics"
-    Option        "SendCoreEvents"    "true"
-    Option        "Device"        "/dev/psaux"
-    Option        "Protocol"        "auto-dev"
-    Option        "HorizEdgeScroll"    "0"
-EndSection
-
-Section "InputDevice"
-    Driver        "wacom"
-    Identifier    "stylus"
-    Option        "Device"    "/dev/input/wacom"
-    Option        "Type"        "stylus"
-    Option        "ForceDevice"    "ISDV4"        # Tablet PC ONLY
-EndSection
-
-Section "InputDevice"
-    Driver        "wacom"
-    Identifier    "eraser"
-    Option        "Device"    "/dev/input/wacom"
-    Option        "Type"        "eraser"
-    Option        "ForceDevice"    "ISDV4"        # Tablet PC ONLY
-EndSection
-
-Section "InputDevice"
-    Driver        "wacom"
-    Identifier    "cursor"
-    Option        "Device"    "/dev/input/wacom"
-    Option        "Type"        "cursor"
-    Option        "ForceDevice"    "ISDV4"        # Tablet PC ONLY
-EndSection
-
 Section "Device"
-    Identifier    "Intel Corporation Mobile 915GM/GMS/910GML Express Graphics Controller"
+    Identifier    "Intel Graphics Driver"
     Driver        "intel"
-    BusID        "PCI:0:2:0"
 EndSection
 
 Section "Monitor"
@@ -67,7 +11,7 @@ EndSection
 
 Section "Screen"
     Identifier    "Default Screen"
-    Device        "Intel Corporation Mobile 915GM/GMS/910GML Express Graphics Controller"
+    Device        "Intel Graphics Driver"
     Monitor        "Generic Monitor"
     DefaultDepth    24
 EndSection
@@ -75,13 +19,9 @@ EndSection
 Section "ServerLayout"
     Identifier    "Default Layout"
     Screen        "Default Screen"
-    InputDevice    "Generic Keyboard"
-    InputDevice    "Configured Mouse"
-    Option         "AllowEmptyInput" "no" 
-# Uncomment if you have a wacom tablet
-#    InputDevice     "stylus"    "SendCoreEvents"
-#    InputDevice     "cursor"    "SendCoreEvents"
-#    InputDevice     "eraser"    "SendCoreEvents"
-    InputDevice    "Synaptics Touchpad"
 EndSection
 
+Section "ServerFlags"
+    Option        "DontZap"  "0"
+    Option        "AllowEmptyInput" "0"
+EndSection
diff --git a/meta/packages/xorg-xserver/xserver-xf86-config_0.1.bb b/meta/packages/xorg-xserver/xserver-xf86-config_0.1.bb
index 5492a25134..d2f894725e 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-config_0.1.bb
+++ b/meta/packages/xorg-xserver/xserver-xf86-config_0.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "X.Org X server configuration file"
 HOMEPAGE = "http://www.x.org"
 SECTION = "x11/base"
 LICENSE = "MIT-X"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "file://xorg.conf"