diff options
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/mac/config.c | 9 | ||||
| -rw-r--r-- | arch/m68k/mac/misc.c | 6 | ||||
| -rw-r--r-- | arch/m68k/sun3/leds.c | 4 |
3 files changed, 14 insertions, 5 deletions
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c index 1c16b1baf8db..c247de02bc7e 100644 --- a/arch/m68k/mac/config.c +++ b/arch/m68k/mac/config.c @@ -332,6 +332,15 @@ static struct mac_model mac_data_table[] = { .scc_type = MAC_SCC_II, .nubus_type = MAC_NUBUS, .floppy_type = MAC_FLOPPY_SWIM_ADDR2, + }, { + .ident = MAC_MODEL_CCLII, + .name = "Color Classic II", + .adb_type = MAC_ADB_CUDA, + .via_type = MAC_VIA_IIci, + .scsi_type = MAC_SCSI_OLD, + .scc_type = MAC_SCC_II, + .nubus_type = MAC_NUBUS, + .floppy_type = MAC_FLOPPY_SWIM_ADDR2, }, /* diff --git a/arch/m68k/mac/misc.c b/arch/m68k/mac/misc.c index 0f118ca156d9..e023fc6b37e5 100644 --- a/arch/m68k/mac/misc.c +++ b/arch/m68k/mac/misc.c @@ -91,7 +91,7 @@ static void cuda_write_pram(int offset, __u8 data) #define cuda_write_pram NULL #endif -#if 0 /* def CONFIG_ADB_PMU68K */ +#ifdef CONFIG_ADB_PMU68K static long pmu_read_time(void) { struct adb_request req; @@ -102,8 +102,8 @@ static long pmu_read_time(void) while (!req.complete) pmu_poll(); - time = (req.reply[0] << 24) | (req.reply[1] << 16) - | (req.reply[2] << 8) | req.reply[3]; + time = (req.reply[1] << 24) | (req.reply[2] << 16) + | (req.reply[3] << 8) | req.reply[4]; return time - RTC_OFFSET; } diff --git a/arch/m68k/sun3/leds.c b/arch/m68k/sun3/leds.c index a3e948463982..aad2e0a0682e 100644 --- a/arch/m68k/sun3/leds.c +++ b/arch/m68k/sun3/leds.c @@ -7,7 +7,7 @@ void sun3_leds(unsigned char byte) unsigned char dfc; GET_DFC(dfc); - SET_DFC(FC_CONTROL); - SET_CONTROL_BYTE(AC_LEDS,byte); + SET_DFC(FC_CONTROL); + SET_CONTROL_BYTE(AC_LEDS, byte); SET_DFC(dfc); } |