From 9144e92d6c2ff645011a41835f808f8b58a6bc72 Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Wed, 12 Jun 2013 14:04:52 -0700 Subject: [PATCH] --- yaml --- r: 376969 b: refs/heads/master c: 558c61e5579a81551c0d6c2deaed1da3c7bf714a h: refs/heads/master i: 376967: 52f1f6d9dd293248427a20123a678f3cd096dd04 v: v3 --- [refs] | 2 +- trunk/drivers/rtc/rtc-at91rm9200.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 03d501e59592..e97f48d2bc93 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e099127169429c19544a8f55dd26937fddd5b1f4 +refs/heads/master: 558c61e5579a81551c0d6c2deaed1da3c7bf714a diff --git a/trunk/drivers/rtc/rtc-at91rm9200.c b/trunk/drivers/rtc/rtc-at91rm9200.c index 0eab77b22340..eeeb73f1fc3b 100644 --- a/trunk/drivers/rtc/rtc-at91rm9200.c +++ b/trunk/drivers/rtc/rtc-at91rm9200.c @@ -383,11 +383,13 @@ static int at91_rtc_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(at91_rtc_pm_ops, at91_rtc_suspend, at91_rtc_resume); +#ifdef CONFIG_OF static const struct of_device_id at91_rtc_dt_ids[] = { { .compatible = "atmel,at91rm9200-rtc" }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, at91_rtc_dt_ids); +#endif static struct platform_driver at91_rtc_driver = { .remove = __exit_p(at91_rtc_remove),