Commit c745552a authored by Linus Torvalds's avatar Linus Torvalds

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
...@@ -57,12 +57,12 @@ static void __init mpc830x_rdb_init_IRQ(void) ...@@ -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
......
...@@ -60,11 +60,11 @@ static void __init mpc831x_rdb_init_IRQ(void) ...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment