From 04c694ec732de95fca3f9a9bb01aae9d7aa07a2a Mon Sep 17 00:00:00 2001 From: "holt@sgi.com" Date: Tue, 16 Aug 2011 17:32:24 +0000 Subject: [PATCH] --- yaml --- r: 265327 b: refs/heads/master c: b489da87ebf7b0c106e45dc7a3c65d9d72ac6bd7 h: refs/heads/master i: 265325: 8f7b3c289e0c5d6b0304d179eb68e955bdec342c 265323: a6eb0b99be84d96520f0376e6b9c72e282a2ca99 265319: 9269f912f2c01706b5907d93dabe73d4cc688952 265311: 560fd83e8e37880edb3434c1e15e7faed5a1b23a v: v3 --- [refs] | 2 +- trunk/arch/powerpc/Kconfig | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2484411b5426..d1109afbbaee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 97efe9aef1ae8922666d32f28d712745a86859e9 +refs/heads/master: b489da87ebf7b0c106e45dc7a3c65d9d72ac6bd7 diff --git a/trunk/arch/powerpc/Kconfig b/trunk/arch/powerpc/Kconfig index 6926b61acfea..47682b67fd36 100644 --- a/trunk/arch/powerpc/Kconfig +++ b/trunk/arch/powerpc/Kconfig @@ -656,6 +656,8 @@ config SBUS config FSL_SOC bool + select HAVE_CAN_FLEXCAN if NET && CAN + select PPC_CLOCK if CAN_FLEXCAN config FSL_PCI bool