Merge branch 'master' into upstream-fixes

[pandora-kernel.git] / include / asm-ppc / mpc83xx.h

diff --git a/include/asm-ppc/mpc83xx.h b/include/asm-ppc/mpc83xx.h
index 7cdf60f..02ed2c3 100644 (file)
--- a/include/asm-ppc/mpc83xx.h
+++ b/include/asm-ppc/mpc83xx.h
@@ -17,7 +17,6 @@
 #ifndef __ASM_MPC83xx_H__
 #define __ASM_MPC83xx_H__
 
-#include <linux/config.h>
 #include <asm/mmu.h>
 
 #ifdef CONFIG_83xx
@@ -108,6 +107,7 @@ enum ppc_sys_devices {
        MPC83xx_USB2_DR,
        MPC83xx_USB2_MPH,
        MPC83xx_MDIO,
+       NUM_PPC_SYS_DEVS,
 };
 
 #endif /* CONFIG_83xx */