Message ID | 1363047710.3137.132.camel@x61.thuisdomein (mailing list archive) |
---|---|
State | Accepted, archived |
Commit | d6301775dbcd690b94aa80c404859fe69b60f556 |
Delegated to: | Michael Ellerman |
Headers | show |
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index b89d7eb..3d566c3 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -744,7 +744,6 @@ config PCI bool "PCI support" if PPC_PCI_CHOICE default y if !40x && !CPM2 && !8xx && !PPC_83xx \ && !PPC_85xx && !PPC_86xx && !GAMECUBE_COMMON - default PCI_PERMEDIA if !4xx && !CPM2 && !8xx default PCI_QSPAN if !4xx && !CPM2 && 8xx select ARCH_SUPPORTS_MSI select GENERIC_PCI_IOMAP
The Kconfig symbol PCI_PERMEDIA got removed in v2.6.24, through commit e6b6e3ffb9ee8926f9f2f7dc9147df73e27d5828 ("[POWERPC] Remove APUS support from arch/ppc"). Remove its last occurrence. Signed-off-by: Paul Bolle <pebolle@tiscali.nl> --- Tested with "make ARCH=powerpc menuconfig" using ps3_defconfig, both before and after this patch. ("!4xx && !CPM2 && !8xx" is true for ps3, and it uses PPC_PCI_CHOICE.) Nothing seemed to change. Which makes sense, as defaulting to an undefined symbol should be a nop. arch/powerpc/Kconfig | 1 - 1 file changed, 1 deletion(-)