diff --git a/[refs] b/[refs]
index ac4f65d49dc5..3f2faa568283 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77626ebc0cb540c39f03e988484ee650a99c355b
+refs/heads/master: a85442ade272121927a56e02f7dfde1127482df2
diff --git a/trunk/drivers/input/keyboard/tegra-kbc.c b/trunk/drivers/input/keyboard/tegra-kbc.c
index 4ffe64d53107..c7ae23ead575 100644
--- a/trunk/drivers/input/keyboard/tegra-kbc.c
+++ b/trunk/drivers/input/keyboard/tegra-kbc.c
@@ -29,8 +29,8 @@
 #include <linux/of.h>
 #include <linux/clk.h>
 #include <linux/slab.h>
+#include <linux/input/tegra_kbc.h>
 #include <mach/clk.h>
-#include <mach/kbc.h>
 
 #define KBC_MAX_DEBOUNCE_CNT	0x3ffu
 
diff --git a/trunk/arch/arm/mach-tegra/include/mach/kbc.h b/trunk/include/linux/input/tegra_kbc.h
similarity index 100%
rename from trunk/arch/arm/mach-tegra/include/mach/kbc.h
rename to trunk/include/linux/input/tegra_kbc.h