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

* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6: (41 commits)
  of: remove undefined request_OF_resource & release_OF_resource
  of/sparc: Remove sparc-local declaration of allnodes and devtree_lock
  of: move definition of of_chosen into common code.
  of: remove unused extern reference to devtree_lock
  of: put default string compare and #a/s-cell values into common header
  of/flattree: Don't assume HAVE_LMB
  of: protect linux/of.h with CONFIG_OF
  proc_devtree: fix THIS_MODULE without module.h
  of: Remove old and misplaced function declarations
  of/flattree: Make the kernel accept ePAPR style phandle information
  of/flattree: endian-convert members of boot_param_header
  of: assume big-endian properties, adding conversions where necessary
  of: use __be32 for cell value accessors
  of/flattree: use OF_ROOT_NODE_{SIZE,ADDR}_CELLS DEFAULT for fdt parsing
  of/flattree: use callback to setup initrd from /chosen
  proc_devtree: include linux/of.h
  of: make set_node_proc_entry private to proc_devtree.c
  of: include linux/proc_fs.h
  of/flattree: merge early_init_dt_scan_memory() common code
  of: add 'of_' prefix to machine_is_compatible()
  ...

3 files changed, 15 insertions, 15 deletions

diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index e4e4d433b007..9ee67d6da710 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -1931,22 +1931,22 @@ static int __devinit aty128_init(struct pci_dev *pdev, const struct pci_device_i
                          * PowerMac2,2 summer 2000 iMacs
                          * PowerMac4,1 january 2001 iMacs "flower power"
                          */
-                        if (machine_is_compatible("PowerMac2,1") ||
-                            machine_is_compatible("PowerMac2,2") ||
-                            machine_is_compatible("PowerMac4,1"))
+                        if (of_machine_is_compatible("PowerMac2,1") ||
+                            of_machine_is_compatible("PowerMac2,2") ||
+                            of_machine_is_compatible("PowerMac4,1"))
                                 default_vmode = VMODE_1024_768_75;
 
                         /* iBook SE */
-                        if (machine_is_compatible("PowerBook2,2"))
+                        if (of_machine_is_compatible("PowerBook2,2"))
                                 default_vmode = VMODE_800_600_60;
 
                         /* PowerBook Firewire (Pismo), iBook Dual USB */
-                        if (machine_is_compatible("PowerBook3,1") ||
-                            machine_is_compatible("PowerBook4,1"))
+                        if (of_machine_is_compatible("PowerBook3,1") ||
+                            of_machine_is_compatible("PowerBook4,1"))
                                 default_vmode = VMODE_1024_768_60;
 
                         /* PowerBook Titanium */
-                        if (machine_is_compatible("PowerBook3,2"))
+                        if (of_machine_is_compatible("PowerBook3,2"))
                                 default_vmode = VMODE_1152_768_60;
         
                         if (default_cmode > 16) 
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index 1ddeb4c34763..e45ab8db2ddc 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -2439,7 +2439,7 @@ static int __devinit aty_init(struct fb_info *info)
          * The Apple iBook1 uses non-standard memory frequencies.
          * We detect it and set the frequency manually.
          */
-        if (machine_is_compatible("PowerBook2,1")) {
+        if (of_machine_is_compatible("PowerBook2,1")) {
                 par->pll_limits.mclk = 70;
                 par->pll_limits.xclk = 53;
         }
@@ -2659,7 +2659,7 @@ static int __devinit aty_init(struct fb_info *info)
                       FBINFO_HWACCEL_YPAN;
 
 #ifdef CONFIG_PMAC_BACKLIGHT
-        if (M64_HAS(G3_PB_1_1) && machine_is_compatible("PowerBook1,1")) {
+        if (M64_HAS(G3_PB_1_1) && of_machine_is_compatible("PowerBook1,1")) {
                 /*
                  * these bits let the 101 powerbook
                  * wake up from sleep -- paulus
@@ -2690,9 +2690,9 @@ static int __devinit aty_init(struct fb_info *info)
                                 if (M64_HAS(G3_PB_1024x768))
                                         /* G3 PowerBook with 1024x768 LCD */
                                         default_vmode = VMODE_1024_768_60;
-                                else if (machine_is_compatible("iMac"))
+                                else if (of_machine_is_compatible("iMac"))
                                         default_vmode = VMODE_1024_768_75;
-                                else if (machine_is_compatible("PowerBook2,1"))
+                                else if (of_machine_is_compatible("PowerBook2,1"))
                                         /* iBook with 800x600 LCD */
                                         default_vmode = VMODE_800_600_60;
                                 else
@@ -3104,7 +3104,7 @@ static int __devinit atyfb_setup_sparc(struct pci_dev *pdev,
         }
 
         dp = pci_device_to_OF_node(pdev);
-        if (node == dp->node) {
+        if (node == dp->phandle) {
                 struct fb_var_screeninfo *var = &default_var;
                 unsigned int N, P, Q, M, T, R;
                 u32 v_total, h_total;
diff --git a/drivers/video/aty/radeon_backlight.c b/drivers/video/aty/radeon_backlight.c
index 1a056adb61c8..fa1198c4ccc5 100644
--- a/drivers/video/aty/radeon_backlight.c
+++ b/drivers/video/aty/radeon_backlight.c
@@ -175,9 +175,9 @@ void radeonfb_bl_init(struct radeonfb_info *rinfo)
 
 #ifdef CONFIG_PMAC_BACKLIGHT
         pdata->negative = pdata->negative ||
-                machine_is_compatible("PowerBook4,3") ||
-                machine_is_compatible("PowerBook6,3") ||
-                machine_is_compatible("PowerBook6,5");
+                of_machine_is_compatible("PowerBook4,3") ||
+                of_machine_is_compatible("PowerBook6,3") ||
+                of_machine_is_compatible("PowerBook6,5");
 #endif
 
         rinfo->info->bl_dev = bd;