commit 9c4c5ae3e10e4f2ca799aacbb74e1f5adb86e0b5
author Jon Loeliger <jdl@freescale.com> Sat Jul 23 10:37:35 2005 -0500
committer Jon Loeliger <jdl@freescale.com> Sat Jul 23 10:37:35 2005 -0500
tree ce06516d3935e9f3e2dac253a78742c7d3c211df
parent 2d5df63e4f596fe439405048fd85157cdff079dc

* Patch by Jon Loeliger, Kumar Gala 2005-02-08
  - Convert the CPM2 based functionality to use new CONFIG_CPM2
    option rather than a myriad of CONFIG_MPC8560-like variants.
    Applies to MPC85xx and MPC8260 boards, includes stxgp3 and sbc8560.
    Eliminates the CONFIG_MPC8560 option entirely.  Distributes the
    new CONFIG_CPM2 option to each 8260 board.

include/net.h

diff --git a/include/net.h b/include/net.h
index e50c381..623d225 100644
--- a/include/net.h
+++ b/include/net.h
@@ -29,7 +29,7 @@
 # endif
 #endif	/* CONFIG_MPC5xxx */
 
-#if !defined(CONFIG_NET_MULTI) && (defined(CONFIG_8260) || defined(CONFIG_MPC8560))
+#if !defined(CONFIG_NET_MULTI) && defined(CONFIG_CPM2)
 #include <config.h>
 #if defined(CONFIG_ETHER_ON_FCC)
 #if defined(CONFIG_ETHER_ON_SCC)