diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-10 14:13:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-10 14:13:35 -0700 |
| commit | a92b166e6b8c3c0037493690b2800b0b0dd92063 (patch) | |
| tree | 0d9d52d09d5145f2a058b546077c641413786b48 /arch | |
| parent | 0d6ffdb8f151a2b685c7b45bde7ab2d49fc1bb00 (diff) | |
| parent | 2190a1e7705456c2298873b2547a6eb19b8e31ae (diff) | |
| download | linux-3.10-a92b166e6b8c3c0037493690b2800b0b0dd92063.tar.gz linux-3.10-a92b166e6b8c3c0037493690b2800b0b0dd92063.tar.bz2 linux-3.10-a92b166e6b8c3c0037493690b2800b0b0dd92063.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
zorro: Fix reading of proc/bus/zorro/* in small chunks
zorro: BKL removal
m68k/mac: Fix RTC on PMU machines
m68k/mac: Add color classic ii support
arch/m68k/sun3/leds.c: Checkpatch cleanup
Diffstat (limited to 'arch')
| -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 1c16b1baf8d..c247de02bc7 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 0f118ca156d..e023fc6b37e 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 a3e94846398..aad2e0a0682 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); } |