Merge branches 'pm-core', 'pm-qos', 'pm-domains' and 'pm-opp'

[linux.git] / arch / m68k / sun3 / idprom.c

diff --git a/arch/m68k/sun3/idprom.c b/arch/m68k/sun3/idprom.c
index cfe9aa4223431764f04f8f6fd29f4f00c3cb336c..9c23f506d60df450c809a4f774f8924278fb7961 100644 (file)
--- a/arch/m68k/sun3/idprom.c
+++ b/arch/m68k/sun3/idprom.c
@@ -64,12 +64,14 @@ static void __init display_system_type(unsigned char machtype)
        for (i = 0; i < NUM_SUN_MACHINES; i++) {
                if(Sun_Machines[i].id_machtype == machtype) {
                        if (machtype != (SM_SUN4M_OBP | 0x00))
-                               printk("TYPE: %s\n", Sun_Machines[i].name);
+                               pr_info("TYPE: %s\n", Sun_Machines[i].name);
                        else {
 #if 0
+                               char sysname[128];
+
                                prom_getproperty(prom_root_node, "banner-name",
                                                 sysname, sizeof(sysname));
-                               printk("TYPE: %s\n", sysname);
+                               pr_info("TYPE: %s\n", sysname);
 #endif
                        }
                        return;
@@ -125,5 +127,5 @@ void __init idprom_init(void)
 
        display_system_type(idprom->id_machtype);
 
-       printk("Ethernet address: %pM\n", idprom->id_ethaddr);
+       pr_info("Ethernet address: %pM\n", idprom->id_ethaddr);
 }