From 4b45beef4437f42e81fc83b8fcc60b38c3801f34 Mon Sep 17 00:00:00 2001 From: Magnus Damm Date: Wed, 9 May 2012 23:39:50 +0900 Subject: [PATCH] --- yaml --- r: 310443 b: refs/heads/master c: fc0830fe017d02b7b4995b5c402b484b65d9dfc6 h: refs/heads/master i: 310441: beb6841abd2a2e36d6b5f87fb9fcb528375b00e3 310439: 2145577cc34a4d443ee1af11dd57181064fcac54 v: v3 --- [refs] | 2 +- trunk/drivers/clocksource/em_sti.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) 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, } };