projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux
[cascardo/linux.git]
/
arch
/
powerpc
/
platforms
/
85xx
/
Kconfig
diff --git
a/arch/powerpc/platforms/85xx/Kconfig
b/arch/powerpc/platforms/85xx/Kconfig
index
8f02b05
..
efdd37c
100644
(file)
--- a/
arch/powerpc/platforms/85xx/Kconfig
+++ b/
arch/powerpc/platforms/85xx/Kconfig
@@
-203,7
+203,6
@@
config GE_IMP3A
select DEFAULT_UIMAGE
select SWIOTLB
select MMIO_NVRAM
select DEFAULT_UIMAGE
select SWIOTLB
select MMIO_NVRAM
- select GENERIC_GPIO
select ARCH_REQUIRE_GPIOLIB
select GE_FPGA
help
select ARCH_REQUIRE_GPIOLIB
select GE_FPGA
help
@@
-328,7
+327,7
@@
config B4_QDS
select PPC_E500MC
select PHYS_64BIT
select SWIOTLB
select PPC_E500MC
select PHYS_64BIT
select SWIOTLB
- select G
ENERIC_GPIO
+ select G
PIOLIB
select ARCH_REQUIRE_GPIOLIB
select HAS_RAPIDIO
select PPC_EPAPR_HV_PIC
select ARCH_REQUIRE_GPIOLIB
select HAS_RAPIDIO
select PPC_EPAPR_HV_PIC