m68k/mac: fix powerbook 150 adb_type

[~andy/linux] / arch / m68k / mac / config.c

diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c
index 55db101dd36dae34e70a670888386064b0f50740..b20b1318462cb190d67ab62700c81312fbb0ecf2 100644 (file)
--- a/arch/m68k/mac/config.c
+++ b/arch/m68k/mac/config.c
@@ -594,7 +594,7 @@ static struct mac_model mac_data_table[] = {
                .ident          = MAC_MODEL_TV,
                .name           = "TV",
                .adb_type       = MAC_ADB_CUDA,
-               .via_type       = MAC_VIA_QUADRA,
+               .via_type       = MAC_VIA_IIci,
                .scsi_type      = MAC_SCSI_OLD,
                .scc_type       = MAC_SCC_II,
                .nubus_type     = MAC_NUBUS,
@@ -674,7 +674,7 @@ static struct mac_model mac_data_table[] = {
        }, {
                .ident          = MAC_MODEL_PB150,
                .name           = "PowerBook 150",
-               .adb_type       = MAC_ADB_PB1,
+               .adb_type       = MAC_ADB_PB2,
                .via_type       = MAC_VIA_IIci,
                .scsi_type      = MAC_SCSI_OLD,
                .ide_type       = MAC_IDE_PB,
@@ -893,8 +893,14 @@ static void __init mac_identify(void)
                scc_b_rsrcs[1].start = scc_b_rsrcs[1].end = IRQ_MAC_SCC_B;
                break;
        default:
-               scc_a_rsrcs[1].start = scc_a_rsrcs[1].end = IRQ_MAC_SCC;
-               scc_b_rsrcs[1].start = scc_b_rsrcs[1].end = IRQ_MAC_SCC;
+               /* On non-PSC machines, the serial ports share an IRQ. */
+               if (macintosh_config->ident == MAC_MODEL_IIFX) {
+                       scc_a_rsrcs[1].start = scc_a_rsrcs[1].end = IRQ_MAC_SCC;
+                       scc_b_rsrcs[1].start = scc_b_rsrcs[1].end = IRQ_MAC_SCC;
+               } else {
+                       scc_a_rsrcs[1].start = scc_a_rsrcs[1].end = IRQ_AUTO_4;
+                       scc_b_rsrcs[1].start = scc_b_rsrcs[1].end = IRQ_AUTO_4;
+               }
                break;
        }