Merge commit 'origin/master' into next

Manual merge of:
	drivers/char/hvc_console.c
	drivers/char/hvc_console.h

14 files changed, 35 insertions, 35 deletions

diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c
index 23741cec45e3..d840a109f833 100644
--- a/drivers/macintosh/adb.c
+++ b/drivers/macintosh/adb.c
@@ -322,8 +322,8 @@ static int __init adb_init(void)
                 adb_controller = NULL;
         } else {
 #ifdef CONFIG_PPC
-                if (machine_is_compatible("AAPL,PowerBook1998") ||
-                        machine_is_compatible("PowerBook1,1"))
+                if (of_machine_is_compatible("AAPL,PowerBook1998") ||
+                        of_machine_is_compatible("PowerBook1,1"))
                         sleepy_trackpad = 1;
 #endif /* CONFIG_PPC */
 
diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c
index 454bc501df3c..5738d8bf2d97 100644
--- a/drivers/macintosh/therm_pm72.c
+++ b/drivers/macintosh/therm_pm72.c
@@ -1899,7 +1899,7 @@ static int create_control_loops(void)
          */
         if (rackmac)
                 cpu_pid_type = CPU_PID_TYPE_RACKMAC;
-        else if (machine_is_compatible("PowerMac7,3")
+        else if (of_machine_is_compatible("PowerMac7,3")
             && (cpu_count > 1)
             && fcu_fans[CPUA_PUMP_RPM_INDEX].id != FCU_FAN_ABSENT_ID
             && fcu_fans[CPUB_PUMP_RPM_INDEX].id != FCU_FAN_ABSENT_ID) {
@@ -2234,10 +2234,10 @@ static int __init therm_pm72_init(void)
 {
         struct device_node *np;
 
-        rackmac = machine_is_compatible("RackMac3,1");
+        rackmac = of_machine_is_compatible("RackMac3,1");
 
-        if (!machine_is_compatible("PowerMac7,2") &&
-            !machine_is_compatible("PowerMac7,3") &&
+        if (!of_machine_is_compatible("PowerMac7,2") &&
+            !of_machine_is_compatible("PowerMac7,3") &&
             !rackmac)
                 return -ENODEV;
 
diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c
index ba48fd76396e..7fb8b4da35a7 100644
--- a/drivers/macintosh/therm_windtunnel.c
+++ b/drivers/macintosh/therm_windtunnel.c
@@ -490,7 +490,7 @@ g4fan_init( void )
         info = of_get_property(np, "thermal-info", NULL);
         of_node_put(np);
 
-        if( !info || !machine_is_compatible("PowerMac3,6") )
+        if( !info || !of_machine_is_compatible("PowerMac3,6") )
                 return -ENODEV;
 
         if( info->id != 3 ) {
diff --git a/drivers/macintosh/via-pmu-backlight.c b/drivers/macintosh/via-pmu-backlight.c
index a348bb0791d3..4f3c4479c16a 100644
--- a/drivers/macintosh/via-pmu-backlight.c
+++ b/drivers/macintosh/via-pmu-backlight.c
@@ -150,13 +150,13 @@ void __init pmu_backlight_init()
 
         /* Special case for the old PowerBook since I can't test on it */
         autosave =
-                machine_is_compatible("AAPL,3400/2400") ||
-                machine_is_compatible("AAPL,3500");
+                of_machine_is_compatible("AAPL,3400/2400") ||
+                of_machine_is_compatible("AAPL,3500");
 
         if (!autosave &&
             !pmac_has_backlight_type("pmu") &&
-            !machine_is_compatible("AAPL,PowerBook1998") &&
-            !machine_is_compatible("PowerBook1,1"))
+            !of_machine_is_compatible("AAPL,PowerBook1998") &&
+            !of_machine_is_compatible("PowerBook1,1"))
                 return;
 
         snprintf(name, sizeof(name), "pmubl");
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index db379c381432..42764849eb78 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -463,8 +463,8 @@ static int __init via_pmu_dev_init(void)
 #endif
 
 #ifdef CONFIG_PPC32
-        if (machine_is_compatible("AAPL,3400/2400") ||
-                machine_is_compatible("AAPL,3500")) {
+        if (of_machine_is_compatible("AAPL,3400/2400") ||
+                of_machine_is_compatible("AAPL,3500")) {
                 int mb = pmac_call_feature(PMAC_FTR_GET_MB_INFO,
                         NULL, PMAC_MB_INFO_MODEL, 0);
                 pmu_battery_count = 1;
@@ -472,8 +472,8 @@ static int __init via_pmu_dev_init(void)
                         pmu_batteries[0].flags |= PMU_BATT_TYPE_COMET;
                 else
                         pmu_batteries[0].flags |= PMU_BATT_TYPE_HOOPER;
-        } else if (machine_is_compatible("AAPL,PowerBook1998") ||
-                machine_is_compatible("PowerBook1,1")) {
+        } else if (of_machine_is_compatible("AAPL,PowerBook1998") ||
+                of_machine_is_compatible("PowerBook1,1")) {
                 pmu_battery_count = 2;
                 pmu_batteries[0].flags |= PMU_BATT_TYPE_SMART;
                 pmu_batteries[1].flags |= PMU_BATT_TYPE_SMART;
diff --git a/drivers/macintosh/windfarm_core.c b/drivers/macintosh/windfarm_core.c
index 075b4d99e354..437f55c5d18d 100644
--- a/drivers/macintosh/windfarm_core.c
+++ b/drivers/macintosh/windfarm_core.c
@@ -468,9 +468,9 @@ static int __init windfarm_core_init(void)
         DBG("wf: core loaded\n");
 
         /* Don't register on old machines that use therm_pm72 for now */
-        if (machine_is_compatible("PowerMac7,2") ||
-            machine_is_compatible("PowerMac7,3") ||
-            machine_is_compatible("RackMac3,1"))
+        if (of_machine_is_compatible("PowerMac7,2") ||
+            of_machine_is_compatible("PowerMac7,3") ||
+            of_machine_is_compatible("RackMac3,1"))
                 return -ENODEV;
         platform_device_register(&wf_platform_device);
         return 0;
diff --git a/drivers/macintosh/windfarm_cpufreq_clamp.c b/drivers/macintosh/windfarm_cpufreq_clamp.c
index 900aade06198..1a77a7c97d0e 100644
--- a/drivers/macintosh/windfarm_cpufreq_clamp.c
+++ b/drivers/macintosh/windfarm_cpufreq_clamp.c
@@ -76,9 +76,9 @@ static int __init wf_cpufreq_clamp_init(void)
         struct wf_control *clamp;
 
         /* Don't register on old machines that use therm_pm72 for now */
-        if (machine_is_compatible("PowerMac7,2") ||
-            machine_is_compatible("PowerMac7,3") ||
-            machine_is_compatible("RackMac3,1"))
+        if (of_machine_is_compatible("PowerMac7,2") ||
+            of_machine_is_compatible("PowerMac7,3") ||
+            of_machine_is_compatible("RackMac3,1"))
                 return -ENODEV;
 
         clamp = kmalloc(sizeof(struct wf_control), GFP_KERNEL);
diff --git a/drivers/macintosh/windfarm_lm75_sensor.c b/drivers/macintosh/windfarm_lm75_sensor.c
index ed6426a10773..d8257d35afde 100644
--- a/drivers/macintosh/windfarm_lm75_sensor.c
+++ b/drivers/macintosh/windfarm_lm75_sensor.c
@@ -239,9 +239,9 @@ static struct i2c_driver wf_lm75_driver = {
 static int __init wf_lm75_sensor_init(void)
 {
         /* Don't register on old machines that use therm_pm72 for now */
-        if (machine_is_compatible("PowerMac7,2") ||
-            machine_is_compatible("PowerMac7,3") ||
-            machine_is_compatible("RackMac3,1"))
+        if (of_machine_is_compatible("PowerMac7,2") ||
+            of_machine_is_compatible("PowerMac7,3") ||
+            of_machine_is_compatible("RackMac3,1"))
                 return -ENODEV;
         return i2c_add_driver(&wf_lm75_driver);
 }
diff --git a/drivers/macintosh/windfarm_max6690_sensor.c b/drivers/macintosh/windfarm_max6690_sensor.c
index a67b349319e9..b486eb929fde 100644
--- a/drivers/macintosh/windfarm_max6690_sensor.c
+++ b/drivers/macintosh/windfarm_max6690_sensor.c
@@ -188,9 +188,9 @@ static struct i2c_driver wf_max6690_driver = {
 static int __init wf_max6690_sensor_init(void)
 {
         /* Don't register on old machines that use therm_pm72 for now */
-        if (machine_is_compatible("PowerMac7,2") ||
-            machine_is_compatible("PowerMac7,3") ||
-            machine_is_compatible("RackMac3,1"))
+        if (of_machine_is_compatible("PowerMac7,2") ||
+            of_machine_is_compatible("PowerMac7,3") ||
+            of_machine_is_compatible("RackMac3,1"))
                 return -ENODEV;
         return i2c_add_driver(&wf_max6690_driver);
 }
diff --git a/drivers/macintosh/windfarm_pm112.c b/drivers/macintosh/windfarm_pm112.c
index 73d695dc9e50..e0ee80700cde 100644
--- a/drivers/macintosh/windfarm_pm112.c
+++ b/drivers/macintosh/windfarm_pm112.c
@@ -676,7 +676,7 @@ static int __init wf_pm112_init(void)
 {
         struct device_node *cpu;
 
-        if (!machine_is_compatible("PowerMac11,2"))
+        if (!of_machine_is_compatible("PowerMac11,2"))
                 return -ENODEV;
 
         /* Count the number of CPU cores */
diff --git a/drivers/macintosh/windfarm_pm121.c b/drivers/macintosh/windfarm_pm121.c
index 66ec4fb115bb..947d4afa25ca 100644
--- a/drivers/macintosh/windfarm_pm121.c
+++ b/drivers/macintosh/windfarm_pm121.c
@@ -1008,7 +1008,7 @@ static int __init pm121_init(void)
 {
         int rc = -ENODEV;
 
-        if (machine_is_compatible("PowerMac12,1"))
+        if (of_machine_is_compatible("PowerMac12,1"))
                 rc = pm121_init_pm();
 
         if (rc == 0) {
diff --git a/drivers/macintosh/windfarm_pm81.c b/drivers/macintosh/windfarm_pm81.c
index abbe206474f5..565d5b2adc95 100644
--- a/drivers/macintosh/windfarm_pm81.c
+++ b/drivers/macintosh/windfarm_pm81.c
@@ -779,8 +779,8 @@ static int __init wf_smu_init(void)
 {
         int rc = -ENODEV;
 
-        if (machine_is_compatible("PowerMac8,1") ||
-            machine_is_compatible("PowerMac8,2"))
+        if (of_machine_is_compatible("PowerMac8,1") ||
+            of_machine_is_compatible("PowerMac8,2"))
                 rc = wf_init_pm();
 
         if (rc == 0) {
diff --git a/drivers/macintosh/windfarm_pm91.c b/drivers/macintosh/windfarm_pm91.c
index 764c525b2117..bea99168ff35 100644
--- a/drivers/macintosh/windfarm_pm91.c
+++ b/drivers/macintosh/windfarm_pm91.c
@@ -711,7 +711,7 @@ static int __init wf_smu_init(void)
 {
         int rc = -ENODEV;
 
-        if (machine_is_compatible("PowerMac9,1"))
+        if (of_machine_is_compatible("PowerMac9,1"))
                 rc = wf_init_pm();
 
         if (rc == 0) {
diff --git a/drivers/macintosh/windfarm_smu_sensors.c b/drivers/macintosh/windfarm_smu_sensors.c
index 9c567b93f417..3c193504bb80 100644
--- a/drivers/macintosh/windfarm_smu_sensors.c
+++ b/drivers/macintosh/windfarm_smu_sensors.c
@@ -363,9 +363,9 @@ smu_cpu_power_create(struct wf_sensor *volts, struct wf_sensor *amps)
          * I yet have to figure out what's up with 8,2 and will have to
          * adjust for later, unless we can 100% trust the SDB partition...
          */
-        if ((machine_is_compatible("PowerMac8,1") ||
-             machine_is_compatible("PowerMac8,2") ||
-             machine_is_compatible("PowerMac9,1")) &&
+        if ((of_machine_is_compatible("PowerMac8,1") ||
+             of_machine_is_compatible("PowerMac8,2") ||
+             of_machine_is_compatible("PowerMac9,1")) &&
             cpuvcp_version >= 2) {
                 pow->quadratic = 1;
                 DBG("windfarm: CPU Power using quadratic transform\n");