Hi Alexandre, Today's linux-next merge of the rtc tree got a conflict in:
drivers/rtc/Makefile
between commit:
b5b2bdfc2893 ("rtc: st: Add new driver for ST's LPC RTC")
from the mfd tree and commit:
766218609678 ("rtc: Properly sort Makefile")
from the rtc tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell s...@canb.auug.org.au
diff --cc drivers/rtc/Makefile
index ebe2c085d01c,5ea5370f56f2..000000000000
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@@ -135,6 -139,6 +139,7 @@@ obj-$(CONFIG_RTC_DRV_SPEAR) += rtc-spea
obj-$(CONFIG_RTC_DRV_STARFIRE) += rtc-starfire.o
obj-$(CONFIG_RTC_DRV_STK17TA8) += rtc-stk17ta8.o
obj-$(CONFIG_RTC_DRV_STMP) += rtc-stmp3xxx.o
++obj-$(CONFIG_RTC_DRV_ST_LPC) += rtc-st-lpc.o
obj-$(CONFIG_RTC_DRV_SUN4V) += rtc-sun4v.o
obj-$(CONFIG_RTC_DRV_SUN6I) += rtc-sun6i.o
obj-$(CONFIG_RTC_DRV_SUNXI) += rtc-sunxi.o
pgpZVUkd3R_Ws.pgp
Description: OpenPGP digital signature
