diff options
| author |   Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> | 2010-09-19 19:28:25 +0200 |
|---|---|---|
| committer |   Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2010-12-25 19:51:43 +0100 |
| commit | 896ea1b88bf1b1c2e3b0080e9dee19b9d9110ad6 (patch) | |
| tree | abe5bf7198d3a2c9c8c1f9800708062afb64b475 /recipes/xorg-xserver | |
| parent | c54fa69dd2d8a63f01430546cc9e8c6e83e6fd6a (diff) | |
| download | openembedded-896ea1b88bf1b1c2e3b0080e9dee19b9d9110ad6.tar.gz | |
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>
Diffstat (limited to 'recipes/xorg-xserver')
| -rw-r--r-- | recipes/xorg-xserver/xserver-xorg-conf/nokia900/xorg.conf | 11 |
1 files changed, 3 insertions, 8 deletions
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 |