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()
  ...

1 files changed, 22 insertions, 22 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
index e7b19440102e..22d476160d52 100644
--- a/drivers/gpu/drm/radeon/radeon_combios.c
+++ b/drivers/gpu/drm/radeon/radeon_combios.c
@@ -1279,47 +1279,47 @@ bool radeon_get_legacy_connector_info_from_table(struct drm_device *dev)
         rdev->mode_info.connector_table = radeon_connector_table;
         if (rdev->mode_info.connector_table == CT_NONE) {
 #ifdef CONFIG_PPC_PMAC
-                if (machine_is_compatible("PowerBook3,3")) {
+                if (of_machine_is_compatible("PowerBook3,3")) {
                         /* powerbook with VGA */
                         rdev->mode_info.connector_table = CT_POWERBOOK_VGA;
-                } else if (machine_is_compatible("PowerBook3,4") ||
-                           machine_is_compatible("PowerBook3,5")) {
+                } else if (of_machine_is_compatible("PowerBook3,4") ||
+                           of_machine_is_compatible("PowerBook3,5")) {
                         /* powerbook with internal tmds */
                         rdev->mode_info.connector_table = CT_POWERBOOK_INTERNAL;
-                } else if (machine_is_compatible("PowerBook5,1") ||
-                           machine_is_compatible("PowerBook5,2") ||
-                           machine_is_compatible("PowerBook5,3") ||
-                           machine_is_compatible("PowerBook5,4") ||
-                           machine_is_compatible("PowerBook5,5")) {
+                } else if (of_machine_is_compatible("PowerBook5,1") ||
+                           of_machine_is_compatible("PowerBook5,2") ||
+                           of_machine_is_compatible("PowerBook5,3") ||
+                           of_machine_is_compatible("PowerBook5,4") ||
+                           of_machine_is_compatible("PowerBook5,5")) {
                         /* powerbook with external single link tmds (sil164) */
                         rdev->mode_info.connector_table = CT_POWERBOOK_EXTERNAL;
-                } else if (machine_is_compatible("PowerBook5,6")) {
+                } else if (of_machine_is_compatible("PowerBook5,6")) {
                         /* powerbook with external dual or single link tmds */
                         rdev->mode_info.connector_table = CT_POWERBOOK_EXTERNAL;
-                } else if (machine_is_compatible("PowerBook5,7") ||
-                           machine_is_compatible("PowerBook5,8") ||
-                           machine_is_compatible("PowerBook5,9")) {
+                } else if (of_machine_is_compatible("PowerBook5,7") ||
+                           of_machine_is_compatible("PowerBook5,8") ||
+                           of_machine_is_compatible("PowerBook5,9")) {
                         /* PowerBook6,2 ? */
                         /* powerbook with external dual link tmds (sil1178?) */
                         rdev->mode_info.connector_table = CT_POWERBOOK_EXTERNAL;
-                } else if (machine_is_compatible("PowerBook4,1") ||
-                           machine_is_compatible("PowerBook4,2") ||
-                           machine_is_compatible("PowerBook4,3") ||
-                           machine_is_compatible("PowerBook6,3") ||
-                           machine_is_compatible("PowerBook6,5") ||
-                           machine_is_compatible("PowerBook6,7")) {
+                } else if (of_machine_is_compatible("PowerBook4,1") ||
+                           of_machine_is_compatible("PowerBook4,2") ||
+                           of_machine_is_compatible("PowerBook4,3") ||
+                           of_machine_is_compatible("PowerBook6,3") ||
+                           of_machine_is_compatible("PowerBook6,5") ||
+                           of_machine_is_compatible("PowerBook6,7")) {
                         /* ibook */
                         rdev->mode_info.connector_table = CT_IBOOK;
-                } else if (machine_is_compatible("PowerMac4,4")) {
+                } else if (of_machine_is_compatible("PowerMac4,4")) {
                         /* emac */
                         rdev->mode_info.connector_table = CT_EMAC;
-                } else if (machine_is_compatible("PowerMac10,1")) {
+                } else if (of_machine_is_compatible("PowerMac10,1")) {
                         /* mini with internal tmds */
                         rdev->mode_info.connector_table = CT_MINI_INTERNAL;
-                } else if (machine_is_compatible("PowerMac10,2")) {
+                } else if (of_machine_is_compatible("PowerMac10,2")) {
                         /* mini with external tmds */
                         rdev->mode_info.connector_table = CT_MINI_EXTERNAL;
-                } else if (machine_is_compatible("PowerMac12,1")) {
+                } else if (of_machine_is_compatible("PowerMac12,1")) {
                         /* PowerMac8,1 ? */
                         /* imac g5 isight */
                         rdev->mode_info.connector_table = CT_IMAC_G5_ISIGHT;