From fcd9b9f07c7a9c6efb84e514aac4089e5249fc48 Mon Sep 17 00:00:00 2001 From: Jason Cooper Date: Tue, 6 Mar 2012 23:53:57 +0000 Subject: [PATCH] --- yaml --- r: 296723 b: refs/heads/master c: ea983ede1195982c64220e9030c28ff111c8655c h: refs/heads/master i: 296721: 2dfeae693892bb2ce0b05e55213969bcb5da0e86 296719: f88c9540166a6528ee00f3c130ba8812977d95cb v: v3 --- [refs] | 2 +- trunk/drivers/rtc/rtc-mv.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4f90825eec43..54a358fb7d55 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 163f2cea673a4ae831ad2cd26d8f01977c3add93 +refs/heads/master: ea983ede1195982c64220e9030c28ff111c8655c diff --git a/trunk/drivers/rtc/rtc-mv.c b/trunk/drivers/rtc/rtc-mv.c index 768e2edb9678..0dd8421d41c3 100644 --- a/trunk/drivers/rtc/rtc-mv.c +++ b/trunk/drivers/rtc/rtc-mv.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -294,11 +295,19 @@ static int __exit mv_rtc_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_OF +static struct of_device_id rtc_mv_of_match_table[] = { + { .compatible = "mrvl,orion-rtc", }, + {} +}; +#endif + static struct platform_driver mv_rtc_driver = { .remove = __exit_p(mv_rtc_remove), .driver = { .name = "rtc-mv", .owner = THIS_MODULE, + .of_match_table = of_match_ptr(rtc_mv_of_match_table), }, };