diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2008-08-06 10:01:54 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2008-08-06 10:01:54 +0000 |
| commit | 2851d9baebad7488f5fbad732f57996c0d92b59b (patch) | |
| tree | 65a34077e0c8fb955dce545184a0e14ceccababc /packages/xorg-xserver/xserver-xorg | |
| parent | c68620a0f36860625d7eb03290072b264f27cd67 (diff) | |
| parent | eef5240e073a3795155c0fceb1bfdb70f10e2983 (diff) | |
merge of '751075256c107f73ba206ce1dd071de65d4d33c4'
and '9b0c628cc38533c1bd3c58efadccbe831221b079'
Diffstat (limited to 'packages/xorg-xserver/xserver-xorg')
| -rw-r--r-- | packages/xorg-xserver/xserver-xorg/xorg.conf | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/packages/xorg-xserver/xserver-xorg/xorg.conf b/packages/xorg-xserver/xserver-xorg/xorg.conf index 34f4465764..4b327022f6 100644 --- a/packages/xorg-xserver/xserver-xorg/xorg.conf +++ b/packages/xorg-xserver/xserver-xorg/xorg.conf @@ -67,10 +67,8 @@ EndSection Section "InputDevice" Identifier "Mouse0" Driver "mouse" - Option "Protocol" "PS/2" -# Option "Protocol" "IMPS/2" - Option "Device" "/dev/psaux" -# Option "Device" "/dev/input/mice" + Option "Protocol" "IMPS/2" + Option "Device" "/dev/input/mice" Option "ZAxisMapping" "4 5" Option "Emulate3Buttons" "yes" EndSection @@ -101,28 +99,16 @@ EndSection Section "Device" - Identifier "Videocard0" - Driver "s3" -# Driver "nv" - VendorName "Videocard vendor" - BoardName "S3 driver" - #BoardName "NVidia driver" -EndSection - -Section "Device" Identifier "FBDev" Driver "fbdev" #Option "shadowfb" "off" - VideoRam 4096 EndSection Section "Screen" Identifier "Screen0" - Device "Videocard0" + Device "FBDev" Monitor "Monitor0" -# DefaultDepth 8 DefaultDepth 16 -# DefaultDepth 24 SubSection "Display" Depth 8 |