Subject: + rtc-at91rm9200-add-match-table-compile-guard.patch added to -mm tree
To: jhovold@xxxxxxxxx,Robert.Nelson@xxxxxxxxxxx,dgilbert@xxxxxxxxxxxx,ludovic.desroches@xxxxxxxxx,nicolas.ferre@xxxxxxxxx,plagnioj@xxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Wed, 29 May 2013 13:33:59 -0700
The patch titled
Subject: rtc-at91rm9200: add match-table compile guard
has been added to the -mm tree. Its filename is
rtc-at91rm9200-add-match-table-compile-guard.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Johan Hovold <jhovold@xxxxxxxxx>
Subject: rtc-at91rm9200: add match-table compile guard
Add missing match-table compile guard.
Signed-off-by: Johan Hovold <jhovold@xxxxxxxxx>
Cc: Nicolas Ferre <nicolas.ferre@xxxxxxxxx>
Cc: Douglas Gilbert <dgilbert@xxxxxxxxxxxx>
Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx>
Cc: Ludovic Desroches <ludovic.desroches@xxxxxxxxx>
Cc: Robert Nelson <Robert.Nelson@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/rtc/rtc-at91rm9200.c | 2 ++
1 file changed, 2 insertions(+)
diff -puN drivers/rtc/rtc-at91rm9200.c~rtc-at91rm9200-add-match-table-compile-guard drivers/rtc/rtc-at91rm9200.c
--- a/drivers/rtc/rtc-at91rm9200.c~rtc-at91rm9200-add-match-table-compile-guard
+++ a/drivers/rtc/rtc-at91rm9200.c
@@ -381,11 +381,13 @@ static int at91_rtc_resume(struct device
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),
_
Patches currently in -mm which might be from jhovold@xxxxxxxxx are
rtc-at91rm9200-add-match-table-compile-guard.patch
rtc-at91rm9200-add-configuration-support.patch
rtc-at91rm9200-refactor-interrupt-register-handling.patch
rtc-at91rm9200-add-shadow-interrupt-mask.patch
rtc-at91rm9200-use-shadow-imr-on-at91sam9x5.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
