kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
* 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6:
  powerpc/83xx: fix build failures on dt compatible list.
This commit is contained in:
Linus Torvalds 2011-01-21 13:24:16 -08:00
commit c745552a82
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/powerpc/platforms/83xx/mpc830x_rdb.c
View file

@ -57,12 +57,12 @@ static void __init mpc830x_rdb_init_IRQ(void)
ipic_set_default_priority(); ipic_set_default_priority();
} }
struct const char *board[] __initdata = { static const char *board[] __initdata = {
"MPC8308RDB", "MPC8308RDB",
"fsl,mpc8308rdb", "fsl,mpc8308rdb",
"denx,mpc8308_p1m", "denx,mpc8308_p1m",
NULL NULL
} };
/* /*
* Called very early, MMU is off, device-tree isn't unflattened * Called very early, MMU is off, device-tree isn't unflattened

4
arch/powerpc/platforms/83xx/mpc831x_rdb.c
View file

@ -60,11 +60,11 @@ static void __init mpc831x_rdb_init_IRQ(void)
ipic_set_default_priority(); ipic_set_default_priority();
} }
struct const char *board[] __initdata = { static const char *board[] __initdata = {
"MPC8313ERDB", "MPC8313ERDB",
"fsl,mpc8315erdb", "fsl,mpc8315erdb",
NULL NULL
} };
/* /*
* Called very early, MMU is off, device-tree isn't unflattened * Called very early, MMU is off, device-tree isn't unflattened