From: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
Date: Sun, 19 Sep 2010 17:28:25 +0000 (+0200)
Subject: xserver-xorg-conf: adapt nokia900's xorg.conf to the newer kernel
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=896ea1b88bf1b1c2e3b0080e9dee19b9d9110ad6;p=openembedded.git

xserver-xorg-conf: adapt nokia900's xorg.conf to the newer kernel

* add CoreKeyboard option for nokia900
  This seems to be needed to make it actually load it...
  Otherwise a pc105 model will be there instead of the
  needed nokiarx51 one... needs researching.

Signed-off-by: Klaus Kurzmann <mok@fluxnetz.de>
---

diff --git a/recipes/xorg-xserver/xserver-xorg-conf/nokia900/xorg.conf b/recipes/xorg-xserver/xserver-xorg-conf/nokia900/xorg.conf
index ee26fda14a..c1c89a2101 100644
--- a/recipes/xorg-xserver/xserver-xorg-conf/nokia900/xorg.conf
+++ b/recipes/xorg-xserver/xserver-xorg-conf/nokia900/xorg.conf
@@ -15,18 +15,14 @@ EndSection
 Section "Device"
         Identifier      "Default omapfb Device"
         Driver		"omapfb"
-EndSection
+	Option		"fb" "/dev/fb0"
 
-Section "InputDevice"
-	Identifier      "Power Button"
-	Driver          "evdev"
-	Option          "Device"        "/dev/input/event0"
 EndSection
 
 Section "InputDevice"
 	Identifier      "Keyboard"
 	Driver          "evdev"
-	Option		"Device"	"/dev/input/event1"
+	Option		"Device"	"/dev/input/event0"
 	Option		"XkbModel"	"nokiarx51"
 	Option		"XkbLayout"	"us"
 	Option          "CoreKeyboard"
@@ -35,7 +31,7 @@ EndSection
 Section "InputDevice"
 	Identifier      "Touchscreen"
 	Driver          "evdev"
-	Option          "Device"        "/dev/input/event3"
+	Option          "Device"        "/dev/input/event1"
 EndSection
 
 Section "Screen"
@@ -47,6 +43,5 @@ Section "ServerLayout"
 	Identifier      "Default Layout"
 	Screen		"Default Screen"
 	InputDevice     "Touchscreen"
-	InputDevice     "Power Button"
 	InputDevice     "Keyboard"
 EndSection