Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c745552a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6 

* 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6:
  powerpc/83xx: fix build failures on dt compatible list.
parents d41ad6df 5d1034f0

arch/powerpc/platforms/83xx/mpc830x_rdb.c

+2 −2
Original line number Diff line number Diff line
@@ -57,12 +57,12 @@ static void __init mpc830x_rdb_init_IRQ(void) 
	ipic_set_default_priority();

}



struct const char *board[] __initdata = {

static const char *board[] __initdata = {

	"MPC8308RDB",

	"fsl,mpc8308rdb",

	"denx,mpc8308_p1m",

	NULL

}

};



/*

 * Called very early, MMU is off, device-tree isn't unflattened

arch/powerpc/platforms/83xx/mpc831x_rdb.c

+2 −2
Original line number Diff line number Diff line
@@ -60,11 +60,11 @@ static void __init mpc831x_rdb_init_IRQ(void) 
	ipic_set_default_priority();

}



struct const char *board[] __initdata = {

static const char *board[] __initdata = {

	"MPC8313ERDB",

	"fsl,mpc8315erdb",

	NULL

}

};



/*

 * Called very early, MMU is off, device-tree isn't unflattened