3 files changed, 2 insertions, 69 deletions
diff --git a/xorg-server/xkeyboard-config/compat/Makefile.am b/xorg-server/xkeyboard-config/compat/Makefile.am
index 54a659eec..2be8154a2 100644
--- a/xorg-server/xkeyboard-config/compat/Makefile.am
+++ b/xorg-server/xkeyboard-config/compat/Makefile.am
@@ -3,9 +3,9 @@ compatdir = $(xkb_base)/compat
 dist_compat_DATA = \
 accessx basic caps complete \
 default iso9995 \
-japan keypad ledcaps \
+japan ledcaps \
 lednum ledscroll level5 \
-misc mousekeys norepeat \
+misc mousekeys \
 olpc pc pc98 xfree86 \
 xtest README
 
diff --git a/xorg-server/xkeyboard-config/compat/keypad b/xorg-server/xkeyboard-config/compat/keypad
deleted file mode 100644
index f28ca1497..000000000
--- a/xorg-server/xkeyboard-config/compat/keypad
+++ /dev/null
@@ -1,58 +0,0 @@
-// Interpretations needed to implement the numeric keypad
-// as an overlay instead of a modifier.
-
-partial hidden xkb_compatibility "overlay"  {
-    include "keypad(overlay1)"
-};
-partial hidden xkb_compatibility "overlay1"  {
-    virtual_modifiers NumLock,AltGr;
-
-    interpret.repeat= False;
-    setMods.clearLocks= True;
-    latchMods.clearLocks= True;
-    latchMods.latchToLock= True;
-
-    interpret Num_Lock {
-	virtualModifier= NumLock;
-	action= LockControls(ctrls=overlay1);
-    };
-    interpret Num_Lock+Any {
-	virtualModifier= NumLock;
-	action= LockControls(ctrls=overlay1);
-    };
-
-    indicator.allowExplicit= True;
-    indicator.driveskbd= True;
-    replace indicator "Num Lock" {
-	whichModState= Locked;
-	modifiers= NumLock;
-	controls= Overlay1;
-    };
-    indicator.allowExplicit= True;
-};
-partial hidden xkb_compatibility "overlay2"  {
-    virtual_modifiers NumLock,AltGr;
-
-    interpret.repeat= False;
-    setMods.clearLocks= True;
-    latchMods.clearLocks= True;
-    latchMods.latchToLock= True;
-
-    interpret Num_Lock {
-	virtualModifier= NumLock;
-	action= LockControls(ctrls=overlay2);
-    };
-    interpret Num_Lock+Any {
-	virtualModifier= NumLock;
-	action= LockControls(ctrls=overlay1);
-    };
-
-    indicator.allowExplicit= True;
-    indicator.driveskbd= True;
-    replace indicator "Num Lock" {
-	whichModState= Locked;
-	modifiers= NumLock;
-	controls= Overlay2;
-    };
-    indicator.allowExplicit= True;
-};
diff --git a/xorg-server/xkeyboard-config/compat/norepeat b/xorg-server/xkeyboard-config/compat/norepeat
deleted file mode 100644
index 1f47d7e17..000000000
--- a/xorg-server/xkeyboard-config/compat/norepeat
+++ /dev/null
@@ -1,9 +0,0 @@
-// Put any otherwise normal keys that you don't want to repeat in
-// this file
-
-default partial xkb_compatibility "norepeat"  {
-    interpret Return {
-	action= NoAction();
-	repeat= False;
-    };
-};