From 80eb996f72acffce3ce7f301feb4c590b7963a12 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Mon, 22 Sep 2008 14:52:19 -0700 Subject: [PATCH] --- yaml --- r: 111923 b: refs/heads/master c: 83dad4c3773b2be110f9ab0c9031e6129bd2e294 h: refs/heads/master i: 111921: 1baa9bf12efdbb88a8977911d85d8ae8e75fa373 111919: ba8c35265228be92734731e376d3572d5f864f5f v: v3 --- [refs] | 2 +- trunk/drivers/net/Kconfig | 2 +- trunk/drivers/net/ibm_newemac/Kconfig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9849601bdef3..f4a119fcbdc3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e2f092ff9bf2ab515c14d2208b5f08c7d389d5d2 +refs/heads/master: 83dad4c3773b2be110f9ab0c9031e6129bd2e294 diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig index 42b4eb703c2d..f6fd0be9ef5e 100644 --- a/trunk/drivers/net/Kconfig +++ b/trunk/drivers/net/Kconfig @@ -1813,7 +1813,7 @@ config FEC2 config FEC_MPC52xx tristate "MPC52xx FEC driver" - depends on PPC_MERGE && PPC_MPC52xx && PPC_BESTCOMM_FEC + depends on PPC_MPC52xx && PPC_BESTCOMM_FEC select CRC32 select PHYLIB ---help--- diff --git a/trunk/drivers/net/ibm_newemac/Kconfig b/trunk/drivers/net/ibm_newemac/Kconfig index 70a3272ee998..bcec7320895c 100644 --- a/trunk/drivers/net/ibm_newemac/Kconfig +++ b/trunk/drivers/net/ibm_newemac/Kconfig @@ -1,6 +1,6 @@ config IBM_NEW_EMAC tristate "IBM EMAC Ethernet support" - depends on PPC_DCR && PPC_MERGE + depends on PPC_DCR select CRC32 help This driver supports the IBM EMAC family of Ethernet controllers