lkml.org 
[lkml]   [2013]   [Oct]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Subjectlinux-next: manual merge of the usb tree
Date
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"
+
+ source "drivers/phy/Kconfig"
+
endmenu


\
 
 \ /
  Last update: 2013-10-22 17:41    [W:0.100 / U:0.296 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site