git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
52xx
/
mpc5200_simple.c
diff --git
a/arch/powerpc/platforms/52xx/mpc5200_simple.c
b/arch/powerpc/platforms/52xx/mpc5200_simple.c
index
d45be5b
..
e36d6e2
100644
(file)
--- a/
arch/powerpc/platforms/52xx/mpc5200_simple.c
+++ b/
arch/powerpc/platforms/52xx/mpc5200_simple.c
@@
-49,7
+49,7
@@
static void __init mpc5200_simple_setup_arch(void)
}
/* list of the supported boards */
}
/* list of the supported boards */
-static char *board[] __initdata = {
+static c
onst c
har *board[] __initdata = {
"intercontrol,digsy-mtc",
"manroland,mucmc52",
"manroland,uc101",
"intercontrol,digsy-mtc",
"manroland,mucmc52",
"manroland,uc101",
@@
-66,16
+66,7
@@
static char *board[] __initdata = {
*/
static int __init mpc5200_simple_probe(void)
{
*/
static int __init mpc5200_simple_probe(void)
{
- unsigned long node = of_get_flat_dt_root();
- int i = 0;
-
- while (board[i]) {
- if (of_flat_dt_is_compatible(node, board[i]))
- break;
- i++;
- }
-
- return (board[i] != NULL);
+ return of_flat_dt_match(of_get_flat_dt_root(), board);
}
define_machine(mpc5200_simple_platform) {
}
define_machine(mpc5200_simple_platform) {