On 10/22/2013 08:08 AM, Thierry Reding wrote:
Today's linux-next merge of the usb tree got a conflict in
drivers/Kconfig
caused by commits ff76496 (drivers: phy: add generic PHY framework) and
12cc4b38 (PowerCap: Add to drivers Kconfig and Makefile).
I fixed it up (see below). Please verify that the resolution look good.
Thanks,
Thierry
---
diff --cc drivers/Kconfig
index 969e987,8f45144..97536a2
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@@ -166,6 -166,6 +166,8 @@@ source "drivers/reset/Kconfig
source "drivers/fmc/Kconfig"
+source "drivers/powercap/Kconfig"
+
Look OK.
+ source "drivers/phy/Kconfig"
+
endmenu
Thanks,
Srinivas
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
