Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / arch / m68k / hp300 / config.c

diff --git a/arch/m68k/hp300/config.c b/arch/m68k/hp300/config.c
index 2e5a787ea11b8f987ef3994292c7d57832bfc266..a9befe65adc42b16e49ee318812eecb8d9b3a3f3 100644 (file)
--- a/arch/m68k/hp300/config.c
+++ b/arch/m68k/hp300/config.c
@@ -87,7 +87,7 @@ int __init hp300_parse_bootinfo(const struct bi_record *record)
                /* serial port address: ignored here */
                break;
 
-        default:
+       default:
                unknown = 1;
        }
 
@@ -262,11 +262,12 @@ void __init config_hp300(void)
 #endif
        mach_max_dma_address = 0xffffffff;
 
-       if (hp300_model >= HP_330 && hp300_model <= HP_433S && hp300_model != HP_350) {
-               printk(KERN_INFO "Detected HP9000 model %s\n", hp300_models[hp300_model-HP_320]);
+       if (hp300_model >= HP_330 && hp300_model <= HP_433S &&
+           hp300_model != HP_350) {
+               pr_info("Detected HP9000 model %s\n",
+                       hp300_models[hp300_model-HP_320]);
                strcat(hp300_model_name, hp300_models[hp300_model-HP_320]);
-       }
-       else {
+       } else {
                panic("Unknown HP9000 Model");
        }
 #ifdef CONFIG_SERIAL_8250_CONSOLE