diff --git a/[refs] b/[refs]
index 0988b9c3efdb..d367b856b3c5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9dbf9517784084ee9496f9f17f9754c1d021a9e
+refs/heads/master: fc0830fe017d02b7b4995b5c402b484b65d9dfc6
diff --git a/trunk/drivers/clocksource/em_sti.c b/trunk/drivers/clocksource/em_sti.c
index 719584a5952b..372051d1bba8 100644
--- a/trunk/drivers/clocksource/em_sti.c
+++ b/trunk/drivers/clocksource/em_sti.c
@@ -384,11 +384,18 @@ static int __devexit em_sti_remove(struct platform_device *pdev)
 	return -EBUSY; /* cannot unregister clockevent and clocksource */
 }
 
+static const struct of_device_id em_sti_dt_ids[] __devinitconst = {
+	{ .compatible = "renesas,em-sti", },
+	{},
+};
+MODULE_DEVICE_TABLE(of, em_sti_dt_ids);
+
 static struct platform_driver em_sti_device_driver = {
 	.probe		= em_sti_probe,
 	.remove		= __devexit_p(em_sti_remove),
 	.driver		= {
 		.name	= "em_sti",
+		.of_match_table = em_sti_dt_ids,
 	}
 };