Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[pandora-kernel.git] / arch / powerpc / platforms / 83xx / mpc831x_rdb.c

diff --git a/arch/powerpc/platforms/83xx/mpc831x_rdb.c b/arch/powerpc/platforms/83xx/mpc831x_rdb.c
index b484b2b..a428f8d 100644 (file)
--- a/arch/powerpc/platforms/83xx/mpc831x_rdb.c
+++ b/arch/powerpc/platforms/83xx/mpc831x_rdb.c
@@ -19,6 +19,7 @@
 #include <asm/time.h>
 #include <asm/ipic.h>
 #include <asm/udbg.h>
+#include <sysdev/fsl_pci.h>
 
 #include "mpc83xx.h"
 
@@ -64,7 +65,8 @@ static int __init mpc831x_rdb_probe(void)
 {
        unsigned long root = of_get_flat_dt_root();
 
-       return of_flat_dt_is_compatible(root, "MPC8313ERDB");
+       return of_flat_dt_is_compatible(root, "MPC8313ERDB") ||
+              of_flat_dt_is_compatible(root, "fsl,mpc8315erdb");
 }
 
 static struct of_device_id __initdata of_bus_ids[] = {