From f49a8c2a1f02f8089d709ec8dcf7080c041baf0c Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 23 Apr 2010 12:38:37 +0000
Subject: svn merge -r544:HEAD "^/branches/released" .

---
 xorg-server/xkbdata.src/rules/base.xml.in | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'xorg-server/xkbdata.src/rules/base.xml.in')

diff --git a/xorg-server/xkbdata.src/rules/base.xml.in b/xorg-server/xkbdata.src/rules/base.xml.in
index d588790d6..e5f02f871 100644
--- a/xorg-server/xkbdata.src/rules/base.xml.in
+++ b/xorg-server/xkbdata.src/rules/base.xml.in
@@ -121,13 +121,6 @@
         <vendor>Acer</vendor>
       </configItem>
     </model>
-    <model>
-      <configItem>
-        <name>acpi</name>
-        <_description>ACPI Standard</_description>
-        <vendor>Generic</vendor>
-      </configItem>
-    </model>
     <model>
       <configItem>
         <name>azonaRF2300</name>
@@ -1133,13 +1126,6 @@
 	<vendor>eMachines</vendor>
       </configItem>
     </model>
-    <model>
-      <configItem>
-	<name>evdev</name>
-	<_description>Evdev-managed keyboard</_description>
-	<vendor>Generic</vendor>
-      </configItem>
-    </model>
     <model>
       <configItem>
 	<name>benqx</name>
-- 
cgit v1.2.3