diff --git a/[refs] b/[refs] index 28ebe4d3fc9a..530b7e870d80 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e65650e6c3eb67226eda80a21f62b7aa145878f4 +refs/heads/master: 6d4ae2ddfeb6e361569bf0f4a477157113e8a74a diff --git a/trunk/arch/powerpc/Kconfig b/trunk/arch/powerpc/Kconfig index 050cb371a69e..9a5d3cdc3e12 100644 --- a/trunk/arch/powerpc/Kconfig +++ b/trunk/arch/powerpc/Kconfig @@ -653,7 +653,7 @@ config SBUS config FSL_SOC bool select HAVE_CAN_FLEXCAN if NET && CAN - select PPC_CLOCK if CAN_FLEXCAN + select PPC_CLOCK config FSL_PCI bool