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

[mv-sheeva.git] / drivers / char / hvc_beat.c

diff --git a/drivers/char/hvc_beat.c b/drivers/char/hvc_beat.c
index 6913fc33270cb94bafcb27e0b3be2e99f0e0c6ff..5fe4631e2a6135f1fb2c417246b7e306e980475b 100644 (file)
--- a/drivers/char/hvc_beat.c
+++ b/drivers/char/hvc_beat.c
@@ -99,7 +99,7 @@ static int hvc_beat_config(char *p)
 
 static int __init hvc_beat_console_init(void)
 {
-       if (hvc_beat_useit && machine_is_compatible("Beat")) {
+       if (hvc_beat_useit && of_machine_is_compatible("Beat")) {
                hvc_instantiate(0, 0, &hvc_beat_get_put_ops);
        }
        return 0;