diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-05-15 03:49:19 +0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-05-15 03:49:19 +0400 |
| commit | 879f99ef2c4c05d9a7f0a67a05f1415663119825 (patch) | |
| tree | 0399664761f675eef741f8b08b92635069586151 /drivers/rtc/rtc-sunxi.c | |
| parent | 70a26071f8552a0f193cf442f424decfe0f2e569 (diff) | |
| parent | d6d211db37e75de2ddc3a4f979038c40df7cc79c (diff) | |
| download | linux-879f99ef2c4c05d9a7f0a67a05f1415663119825.tar.xz | |
Merge tag 'v3.15-rc5' into next
Merge with Linux 3.15-rc5 to sync up Wacom and other changes.
Diffstat (limited to 'drivers/rtc/rtc-sunxi.c')
| -rw-r--r-- | drivers/rtc/rtc-sunxi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-sunxi.c b/drivers/rtc/rtc-sunxi.c index 68a35284e5ad..b6f21f73d508 100644 --- a/drivers/rtc/rtc-sunxi.c +++ b/drivers/rtc/rtc-sunxi.c @@ -428,7 +428,7 @@ static const struct rtc_class_ops sunxi_rtc_ops = { }; static const struct of_device_id sunxi_rtc_dt_ids[] = { - { .compatible = "allwinner,sun4i-rtc", .data = &data_year_param[0] }, + { .compatible = "allwinner,sun4i-a10-rtc", .data = &data_year_param[0] }, { .compatible = "allwinner,sun7i-a20-rtc", .data = &data_year_param[1] }, { /* sentinel */ }, }; |