Merge remote-tracking branch 'kumar/next' into next

[karo-tx-linux.git] / arch / powerpc / Kconfig

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index a9ae67317374dc7b27b1bdccfa250b07dfadafb5..84cb0c932153bc4720da26fff8cf7de305db733c 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -681,7 +681,6 @@ config SBUS
 config FSL_SOC
        bool
        select HAVE_CAN_FLEXCAN if NET && CAN
-       select PPC_CLOCK
 
 config FSL_PCI
        bool
@@ -769,11 +768,6 @@ config PCI_8260
        select PPC_INDIRECT_PCI
        default y
 
-config 8260_PCI9
-       bool "Enable workaround for MPC826x erratum PCI 9"
-       depends on PCI_8260 && !8272
-       default y
-
 source "drivers/pci/pcie/Kconfig"
 
 source "drivers/pci/Kconfig"