---

yaml --- r: 306573 b: refs/heads/master c: e6293d2 h: refs/heads/master i: 306571: 4da11fa v: v3
git-mirror · Apr 4, 2012 · ec7c2ed · ec7c2ed
1 parent d50813e
commit ec7c2ed
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git 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
@@ -255,13 +255,22 @@ 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),
 	.id_table	= st1232_ts_id,
 	.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