diff --git a/[refs] b/[refs] index ab9ba5f9967f..f471d1edcf97 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 519fd80da9e3020d9fd21fa5c496e499156cd9d6 +refs/heads/master: 846aace363a8cdaa2e7525f489165297bcf865b3 diff --git a/trunk/arch/powerpc/platforms/83xx/Kconfig b/trunk/arch/powerpc/platforms/83xx/Kconfig index 10a665f7774c..924408cc5a81 100644 --- a/trunk/arch/powerpc/platforms/83xx/Kconfig +++ b/trunk/arch/powerpc/platforms/83xx/Kconfig @@ -7,7 +7,7 @@ config MPC831x_RDB bool "Freescale MPC831x RDB" select DEFAULT_UIMAGE help - This option enables support for the MPC8313 RDB board. + This option enables support for the MPC8313 RDB and MPC8315 RDB boards. config MPC832x_MDS bool "Freescale MPC832x MDS" diff --git a/trunk/arch/powerpc/platforms/83xx/mpc831x_rdb.c b/trunk/arch/powerpc/platforms/83xx/mpc831x_rdb.c index b484b2b4ba69..c4db5172b27a 100644 --- a/trunk/arch/powerpc/platforms/83xx/mpc831x_rdb.c +++ b/trunk/arch/powerpc/platforms/83xx/mpc831x_rdb.c @@ -64,7 +64,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[] = {