From ec7c2ed39bfa0d0a2f87f216252ac6fa00c58f47 Mon Sep 17 00:00:00 2001
From: Magnus Damm <damm@opensource.se>
Date: Tue, 3 Apr 2012 11:30:28 -0700
Subject: [PATCH] --- yaml --- r: 306573 b: refs/heads/master c:
 e6293d2f8a6cd427a1ef4ddecb16b1d5ae1929cd h: refs/heads/master i:   306571:
 4da11faf6afd5bb71fd24a611a3061b6f81c2e1d v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/input/touchscreen/st1232.c | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c36287fe8eee..642bee033faf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0bf25a45386f284d591530ef174eaa9e44d84956
+refs/heads/master: e6293d2f8a6cd427a1ef4ddecb16b1d5ae1929cd
diff --git a/trunk/drivers/input/touchscreen/st1232.c b/trunk/drivers/input/touchscreen/st1232.c
index cbbf71b22696..216fabb5accc 100644
--- a/trunk/drivers/input/touchscreen/st1232.c
+++ b/trunk/drivers/input/touchscreen/st1232.c
@@ -255,6 +255,14 @@ static const struct i2c_device_id st1232_ts_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, st1232_ts_id);
 
+#ifdef CONFIG_OF
+static const struct of_device_id st1232_ts_dt_ids[] __devinitconst = {
+	{ .compatible = "sitronix,st1232", },
+	{ }
+};
+MODULE_DEVICE_TABLE(of, st1232_ts_dt_ids);
+#endif
+
 static struct i2c_driver st1232_ts_driver = {
 	.probe		= st1232_ts_probe,
 	.remove		= __devexit_p(st1232_ts_remove),
@@ -262,6 +270,7 @@ static struct i2c_driver st1232_ts_driver = {
 	.driver = {
 		.name	= ST1232_TS_NAME,
 		.owner	= THIS_MODULE,
+		.of_match_table = of_match_ptr(st1232_ts_dt_ids),
 #ifdef CONFIG_PM
 		.pm	= &st1232_ts_pm_ops,
 #endif