diff --git a/[refs] b/[refs]
index fea90801facf..c6e6c71ec234 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43f5b3085fdd27c4edf535d938b2cb0ccead4f75
+refs/heads/master: 309e96cdf2f2c1a071102e8bdf828a3493e6e50a
diff --git a/trunk/include/asm-um/keyboard.h b/trunk/include/asm-um/keyboard.h
deleted file mode 100644
index ee2e2303d0e4..000000000000
--- a/trunk/include/asm-um/keyboard.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_KEYBOARD_H
-#define __UM_KEYBOARD_H
-
-#include "asm/arch/keyboard.h"
-
-#endif