[PATCH] merge fix for Convert selectors of GENERIC_GPIO to GPIOLIB

[Stephen Rothwell]

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 arch/powerpc/platforms/85xx/Kconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/8=
5xx/Kconfig
index fbb3eb9..102c29e 100644
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -327,7 +327,6 @@ config B4_QDS
 	select PPC_E500MC
 	select PHYS_64BIT
 	select SWIOTLB
-	select GENERIC_GPIO
 	select ARCH_REQUIRE_GPIOLIB
 	select HAS_RAPIDIO
 	select PPC_EPAPR_HV_PIC
--=20
1.8.1


--Multipart=_Fri__3_May_2013_10_52_34_+1000_9GFY2zDGQ=6K_NpQ
Content-Type: text/x-diff;
 name="0001-merge-fix-2-for-Convert-selectors-of-GENERIC_GPIO-to.patch"
Content-Disposition: attachment;
 filename="0001-merge-fix-2-for-Convert-selectors-of-GENERIC_GPIO-to.patch"
Content-Transfer-Encoding: quoted-printable