Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / powerpc / platforms / 52xx / media5200.c

diff --git a/arch/powerpc/platforms/52xx/media5200.c b/arch/powerpc/platforms/52xx/media5200.c
index 0bac3a3dbecfdf4fe189d897681ce388b584f508..2c7780cb68e598cff0e6817fb9a599a0ade7d821 100644 (file)
--- a/arch/powerpc/platforms/52xx/media5200.c
+++ b/arch/powerpc/platforms/52xx/media5200.c
@@ -239,7 +239,7 @@ static void __init media5200_setup_arch(void)
 }
 
 /* list of the supported boards */
-static char *board[] __initdata = {
+static const char *board[] __initdata = {
        "fsl,media5200",
        NULL
 };
@@ -249,16 +249,7 @@ static char *board[] __initdata = {
  */
 static int __init media5200_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(media5200_platform) {