* linux-next: manual merge of the gen-gpio tree with the usb tree
@ 2013-04-17 5:47 Stephen Rothwell
2013-04-17 6:37 ` Felipe Balbi
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2013-04-17 5:47 UTC (permalink / raw)
To: Alexandre Courbot; +Cc: linux-next, linux-kernel, Felipe Balbi, Greg KH
[-- Attachment #1: Type: text/plain, Size: 1296 bytes --]
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 <sfr@canb•auug.org.au>
Date: Wed, 17 Apr 2013 15:44:53 +1000
Subject: [PATCH] gen-gpio: GPIOLIB merge fix up
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
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 sfr@canb•auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: linux-next: manual merge of the gen-gpio tree with the usb tree
2013-04-17 5:47 linux-next: manual merge of the gen-gpio tree with the usb tree Stephen Rothwell
@ 2013-04-17 6:37 ` Felipe Balbi
0 siblings, 0 replies; 2+ messages in thread
From: Felipe Balbi @ 2013-04-17 6:37 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Alexandre Courbot, linux-next, linux-kernel, Felipe Balbi,
Greg KH
[-- Attachment #1: Type: text/plain, Size: 606 bytes --]
Hi,
On Wed, Apr 17, 2013 at 03:47:15PM +1000, Stephen Rothwell wrote:
> 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).
Thanks Stephen, looks alright :-)
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-04-17 6:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-17 5:47 linux-next: manual merge of the gen-gpio tree with the usb tree Stephen Rothwell
2013-04-17 6:37 ` Felipe Balbi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox