Hi Alexandre,
Today's linux-next merge of the gen-gpio tree got a conflict in
drivers/usb/otg/Kconfig between commit a0e631235a04 ("usb: phy: move all
PHY drivers to drivers/usb/phy/") from the usb tree and commit
76ec9d18b897 ("Convert selectors of GENERIC_GPIO to GPIOLIB") from the
gen-gpio tree.The former patch removed the file, so I did that and then applied the following patch and can carry the fix as necessary (no action is required). From: Stephen Rothwell <[email protected]> Date: Wed, 17 Apr 2013 15:44:53 +1000 Subject: [PATCH] gen-gpio: GPIOLIB merge fix up Signed-off-by: Stephen Rothwell <[email protected]> --- drivers/usb/phy/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/phy/Kconfig b/drivers/usb/phy/Kconfig index 3a7fec9..21153d1 100644 --- a/drivers/usb/phy/Kconfig +++ b/drivers/usb/phy/Kconfig @@ -128,7 +128,7 @@ config TWL6030_USB config USB_GPIO_VBUS tristate "GPIO based peripheral-only VBUS sensing 'transceiver'" - depends on GENERIC_GPIO + depends on GPIOLIB help Provides simple GPIO VBUS sensing for controllers with an internal transceiver via the usb_phy interface, and -- 1.8.1 -- Cheers, Stephen Rothwell [email protected]
pgpUXrbjrDyvj.pgp
Description: PGP signature
