linux-kernel - linux-next: manual merge of the gen-gpio tree with the usb tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20130417154715.cd3036b3cc791800938119c4@canb.auug.org.au>
Date:	Wed, 17 Apr 2013 15:47:15 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Alexandre Courbot <gnurou@...il.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Felipe Balbi <balbi@...com>, Greg KH <greg@...ah.com>
Subject: linux-next: manual merge of the gen-gpio tree with the usb tree

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@...b.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@...b.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@...b.auug.org.au

Content of type "application/pgp-signature" skipped