Merge branches 'release' and 'wmi-2.6.25' into release

[linux-2.6-omap-h63xx.git] / include / asm-ppc / mpc8xx.h

diff --git a/include/asm-ppc/mpc8xx.h b/include/asm-ppc/mpc8xx.h
index 73ec9a6db0b1a9a31e8c069a513c0c9549d8727d..d3a2f2fe230c2181dcad280df11d0b8c20a58612 100644 (file)
--- a/include/asm-ppc/mpc8xx.h
+++ b/include/asm-ppc/mpc8xx.h
@@ -8,7 +8,6 @@
 #ifndef __CONFIG_8xx_DEFS
 #define __CONFIG_8xx_DEFS
 
-#include <linux/config.h>
 
 #ifdef CONFIG_8xx
 
@@ -111,6 +110,8 @@ enum ppc_sys_devices {
        MPC8xx_CPM_SMC1,
        MPC8xx_CPM_SMC2,
        MPC8xx_CPM_USB,
+       MPC8xx_MDIO_FEC,
+       NUM_PPC_SYS_DEVS,
 };
 
 #define PPC_PIN_SIZE   (24 * 1024 * 1024)      /* 24Mbytes of data pinned */