Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86

[sfrench/cifs-2.6.git] / drivers / char / hvsi.c

diff --git a/drivers/char/hvsi.c b/drivers/char/hvsi.c
index 50315d6364fdd98727133c9fa7930ea0aa755d0f..d5a752da322f855261a06c9aacb93636fb57d1f9 100644 (file)
--- a/drivers/char/hvsi.c
+++ b/drivers/char/hvsi.c
@@ -1279,8 +1279,8 @@ static int __init hvsi_console_init(void)
                struct hvsi_struct *hp;
                const uint32_t *vtermno, *irq;
 
-               vtermno = get_property(vty, "reg", NULL);
-               irq = get_property(vty, "interrupts", NULL);
+               vtermno = of_get_property(vty, "reg", NULL);
+               irq = of_get_property(vty, "interrupts", NULL);
                if (!vtermno || !irq)
                        continue;