Messages in this thread | | | Date | Mon, 24 Dec 2012 13:10:23 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the akpm tree with the driver-core.current tree |
| |
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in drivers/rtc/rtc-tegra.c between commit 9889589ba308 ("Drivers: rtc: remove __dev* attributes") from the driver-core.current tree and commit "drivers/rtc/rtc-tegra.c: convert to DT driver" from the akpm tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/rtc/rtc-tegra.c index 5ba2f75,fb62808..0000000 --- a/drivers/rtc/rtc-tegra.c +++ b/drivers/rtc/rtc-tegra.c @@@ -303,7 -303,13 +303,13 @@@ static struct rtc_class_ops tegra_rtc_o .alarm_irq_enable = tegra_rtc_alarm_irq_enable, }; + static const struct of_device_id tegra_rtc_dt_match[] = { + { .compatible = "nvidia,tegra20-rtc", }, + {} + }; + MODULE_DEVICE_TABLE(of, tegra_rtc_dt_match); + -static int __devinit tegra_rtc_probe(struct platform_device *pdev) +static int tegra_rtc_probe(struct platform_device *pdev) { struct tegra_rtc_info *info; struct resource *res; [unhandled content-type:application/pgp-signature] | |