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, 7 insertions, 7 deletions

diff --git a/arch/powerpc/sysdev/dcr.c b/arch/powerpc/sysdev/dcr.c
index 1fc5819e7d18..574b6ef44e0b 100644
--- a/arch/powerpc/sysdev/dcr.c
+++ b/arch/powerpc/sysdev/dcr.c
@@ -26,7 +26,7 @@
 unsigned int dcr_resource_start(struct device_node *np, unsigned int index)
 {
         unsigned int ds;
-        const u32 *dr = get_property(np, "dcr-reg", &ds);
+        const u32 *dr = of_get_property(np, "dcr-reg", &ds);
 
         if (dr == NULL || ds & 1 || index >= (ds / 8))
                 return 0;
@@ -37,7 +37,7 @@ unsigned int dcr_resource_start(struct device_node *np, unsigned int index)
 unsigned int dcr_resource_len(struct device_node *np, unsigned int index)
 {
         unsigned int ds;
-        const u32 *dr = get_property(np, "dcr-reg", &ds);
+        const u32 *dr = of_get_property(np, "dcr-reg", &ds);
 
         if (dr == NULL || ds & 1 || index >= (ds / 8))
                 return 0;
@@ -53,9 +53,9 @@ static struct device_node * find_dcr_parent(struct device_node * node)
         const u32 *p;
 
         for (par = of_node_get(node); par;) {
-                if (get_property(par, "dcr-controller", NULL))
+                if (of_get_property(par, "dcr-controller", NULL))
                         break;
-                p = get_property(par, "dcr-parent", NULL);
+                p = of_get_property(par, "dcr-parent", NULL);
                 tmp = par;
                 if (p == NULL)
                         par = of_get_parent(par);
@@ -80,13 +80,13 @@ u64 of_translate_dcr_address(struct device_node *dev,
                 return OF_BAD_ADDR;
 
         /* Stride is not properly defined yet, default to 0x10 for Axon */
-        p = get_property(dp, "dcr-mmio-stride", NULL);
+        p = of_get_property(dp, "dcr-mmio-stride", NULL);
         stride = (p == NULL) ? 0x10 : *p;
 
         /* XXX FIXME: Which property name is to use of the 2 following ? */
-        p = get_property(dp, "dcr-mmio-range", NULL);
+        p = of_get_property(dp, "dcr-mmio-range", NULL);
         if (p == NULL)
-                p = get_property(dp, "dcr-mmio-space", NULL);
+                p = of_get_property(dp, "dcr-mmio-space", NULL);
         if (p == NULL)
                 return OF_BAD_ADDR;