Merge branch 'linus' into core/urgent

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / 85xx / sbc8560.c

diff --git a/arch/powerpc/platforms/85xx/sbc8560.c b/arch/powerpc/platforms/85xx/sbc8560.c
index 6509ade71668e658729ddb6266217c6ccd8538fe..0c9a856f66b6f7e2c4c918574e958e804d37292d 100644 (file)
--- a/arch/powerpc/platforms/85xx/sbc8560.c
+++ b/arch/powerpc/platforms/85xx/sbc8560.c
@@ -156,7 +156,7 @@ static void __init init_ioports(void)
        int i;
 
        for (i = 0; i < ARRAY_SIZE(sbc8560_pins); i++) {
-               struct cpm_pin *pin = &sbc8560_pins[i];
+               const struct cpm_pin *pin = &sbc8560_pins[i];
                cpm2_set_pin(pin->port, pin->pin, pin->flags);
        }
 
@@ -200,7 +200,6 @@ static void sbc8560_show_cpuinfo(struct seq_file *m)
        svid = mfspr(SPRN_SVR);
 
        seq_printf(m, "Vendor\t\t: Wind River\n");
-       seq_printf(m, "Machine\t\t: SBC8560\n");
        seq_printf(m, "PVR\t\t: 0x%x\n", pvid);
        seq_printf(m, "SVR\t\t: 0x%x\n", svid);