Merge branch 'for-2.6.22' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'for-2.6.22' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (255 commits)
  [POWERPC] Remove dev_dbg redefinition in drivers/ps3/vuart.c
  [POWERPC] remove kernel module option for booke wdt
  [POWERPC] Avoid putting cpu node twice
  [POWERPC] Spinlock initializer cleanup
  [POWERPC] ppc4xx_sgdma needs dma-mapping.h
  [POWERPC] arch/powerpc/sysdev/timer.c build fix
  [POWERPC] get_property cleanups
  [POWERPC] Remove the unused HTDMSOUND driver
  [POWERPC] cell: cbe_cpufreq cleanup and crash fix
  [POWERPC] Declare enable_kernel_spe in a header
  [POWERPC] Add dt_xlate_addr() to bootwrapper
  [POWERPC] bootwrapper: CONFIG_ -> CONFIG_DEVICE_TREE
  [POWERPC] Don't define a custom bd_t for Xilixn Virtex based boards.
  [POWERPC] Add sane defaults for Xilinx EDK generated xparameters files
  [POWERPC] Add uartlite boot console driver for the zImage wrapper
  [POWERPC] Stop using ppc_sys for Xilinx Virtex boards
  [POWERPC] New registration for common Xilinx Virtex ppc405 platform devices
  [POWERPC] Merge common virtex header files
  [POWERPC] Rework Kconfig dependancies for Xilinx Virtex ppc405 platform
  [POWERPC] Clean up cpufreq Kconfig dependencies
  ...

1 files changed, 11 insertions, 11 deletions

diff --git a/arch/powerpc/kernel/btext.c b/arch/powerpc/kernel/btext.c
index 3678997339d6..e7b684689e04 100644
--- a/arch/powerpc/kernel/btext.c
+++ b/arch/powerpc/kernel/btext.c
@@ -161,33 +161,33 @@ int btext_initialize(struct device_node *np)
         unsigned long address = 0;
         const u32 *prop;
 
-        prop = get_property(np, "linux,bootx-width", NULL);
+        prop = of_get_property(np, "linux,bootx-width", NULL);
         if (prop == NULL)
-                prop = get_property(np, "width", NULL);
+                prop = of_get_property(np, "width", NULL);
         if (prop == NULL)
                 return -EINVAL;
         width = *prop;
-        prop = get_property(np, "linux,bootx-height", NULL);
+        prop = of_get_property(np, "linux,bootx-height", NULL);
         if (prop == NULL)
-                prop = get_property(np, "height", NULL);
+                prop = of_get_property(np, "height", NULL);
         if (prop == NULL)
                 return -EINVAL;
         height = *prop;
-        prop = get_property(np, "linux,bootx-depth", NULL);
+        prop = of_get_property(np, "linux,bootx-depth", NULL);
         if (prop == NULL)
-                prop = get_property(np, "depth", NULL);
+                prop = of_get_property(np, "depth", NULL);
         if (prop == NULL)
                 return -EINVAL;
         depth = *prop;
         pitch = width * ((depth + 7) / 8);
-        prop = get_property(np, "linux,bootx-linebytes", NULL);
+        prop = of_get_property(np, "linux,bootx-linebytes", NULL);
         if (prop == NULL)
-                prop = get_property(np, "linebytes", NULL);
+                prop = of_get_property(np, "linebytes", NULL);
         if (prop && *prop != 0xffffffffu)
                 pitch = *prop;
         if (pitch == 1)
                 pitch = 0x1000;
-        prop = get_property(np, "address", NULL);
+        prop = of_get_property(np, "address", NULL);
         if (prop)
                 address = *prop;
 
@@ -219,7 +219,7 @@ int __init btext_find_display(int allow_nonstdout)
         struct device_node *np = NULL; 
         int rc = -ENODEV;
 
-        name = get_property(of_chosen, "linux,stdout-path", NULL);
+        name = of_get_property(of_chosen, "linux,stdout-path", NULL);
         if (name != NULL) {
                 np = of_find_node_by_path(name);
                 if (np != NULL) {
@@ -236,7 +236,7 @@ int __init btext_find_display(int allow_nonstdout)
                 return rc;
 
         for (np = NULL; (np = of_find_node_by_type(np, "display"));) {
-                if (get_property(np, "linux,opened", NULL)) {
+                if (of_get_property(np, "linux,opened", NULL)) {
                         printk("trying %s ...\n", np->full_name);
                         rc = btext_initialize(np);
                         printk("result: %d\n", rc);