From a974e45ab8d2c90551dddc385b6c93c620c93587 Mon Sep 17 00:00:00 2001
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Wed, 14 Nov 2012 08:16:15 -0800
Subject: [PATCH] --- yaml --- r: 346973 b: refs/heads/master c:
 5cc0dfe043f84a777bf9d66dc48cc2b83709c9ef h: refs/heads/master i:   346971:
 63e9c5dd033300bfeeddfb00563c49fc9ac705c7 v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/input/keyboard/tca8418_keypad.c | 29 +++++++++----------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 4454c7e6144c..66c67da406df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cdbe8a86379b9002598a4d14791dc8e790b1f5f5
+refs/heads/master: 5cc0dfe043f84a777bf9d66dc48cc2b83709c9ef
diff --git a/trunk/drivers/input/keyboard/tca8418_keypad.c b/trunk/drivers/input/keyboard/tca8418_keypad.c
index ab41a2ea3055..9084327efb3a 100644
--- a/trunk/drivers/input/keyboard/tca8418_keypad.c
+++ b/trunk/drivers/input/keyboard/tca8418_keypad.c
@@ -110,21 +110,6 @@
 #define KEY_EVENT_CODE		0x7f
 #define KEY_EVENT_VALUE		0x80
 
-
-static const struct i2c_device_id tca8418_id[] = {
-	{ TCA8418_NAME, 8418, },
-	{ }
-};
-MODULE_DEVICE_TABLE(i2c, tca8418_id);
-
-#ifdef CONFIG_OF
-static const struct of_device_id tca8418_dt_ids[] __devinitconst = {
-	{ .compatible = "ti,tca8418", },
-	{ }
-};
-MODULE_DEVICE_TABLE(of, tca8418_dt_ids);
-#endif
-
 struct tca8418_keypad {
 	unsigned int irq;
 	unsigned int row_shift;
@@ -419,6 +404,20 @@ static int tca8418_keypad_remove(struct i2c_client *client)
 	return 0;
 }
 
+static const struct i2c_device_id tca8418_id[] = {
+	{ TCA8418_NAME, 8418, },
+	{ }
+};
+MODULE_DEVICE_TABLE(i2c, tca8418_id);
+
+#ifdef CONFIG_OF
+static const struct of_device_id tca8418_dt_ids[] __devinitconst = {
+	{ .compatible = "ti,tca8418", },
+	{ }
+};
+MODULE_DEVICE_TABLE(of, tca8418_dt_ids);
+#endif
+
 static struct i2c_driver tca8418_keypad_driver = {
 	.driver = {
 		.name	= TCA8418_NAME,