diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2014-11-20 08:42:02 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2014-11-20 08:42:02 -0500 |
| commit | a02001086bbfb4da35d1228bebc2f1b442db455f (patch) | |
| tree | 62ab47936cef06fd08657ca5b6cd1df98c19be57 /drivers/rtc/rtc-mpc5121.c | |
| parent | eff264efeeb0898408e8c9df72d8a32621035bed (diff) | |
| parent | fc14f9c1272f62c3e8d01300f52467c0d9af50f9 (diff) | |
Merge Linus' tree to be be to apply submitted patches to newer code than
current trivial.git base
Diffstat (limited to 'drivers/rtc/rtc-mpc5121.c')
| -rw-r--r-- | drivers/rtc/rtc-mpc5121.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-mpc5121.c b/drivers/rtc/rtc-mpc5121.c index dc4f14255cc3..3b965ad6f4d5 100644 --- a/drivers/rtc/rtc-mpc5121.c +++ b/drivers/rtc/rtc-mpc5121.c | |||
| @@ -401,7 +401,7 @@ static int mpc5121_rtc_remove(struct platform_device *op) | |||
| 401 | } | 401 | } |
| 402 | 402 | ||
| 403 | #ifdef CONFIG_OF | 403 | #ifdef CONFIG_OF |
| 404 | static struct of_device_id mpc5121_rtc_match[] = { | 404 | static const struct of_device_id mpc5121_rtc_match[] = { |
| 405 | { .compatible = "fsl,mpc5121-rtc", }, | 405 | { .compatible = "fsl,mpc5121-rtc", }, |
| 406 | { .compatible = "fsl,mpc5200-rtc", }, | 406 | { .compatible = "fsl,mpc5200-rtc", }, |
| 407 | {}, | 407 | {}, |