diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-10 13:27:24 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-10 13:27:24 -0800 |
| commit | ab0475df5ce45d80a9e5f056cbad3a58e4930206 (patch) | |
| tree | 053912870c86d7bbec54f107215c8c7bbb04806a /arch/m68k/include/asm/macintosh.h | |
| parent | 3e8c04eb117445d67ae2b83e08bec4005129356a (diff) | |
| parent | 4436820a98cdaf497a874323095e328831030956 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
"Summary:
- switch to asm-generic/futex.h
- various cleanups
- defconfig updates"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k/defconfig: Enable Ethernet bridging
m68k/defconfig: Enable Atari EtherNAT and EtherNEC Ethernet support
m68k/defconfig: Enable automounting of devtmpfs at /dev
m68k/defconfig: Enable early printk support
m68k/defconfig: Enable test modules
m68k/defconfig: Refresh defconfigs for v3.16-rc1--v3.19-rc2
m68k/atari: Remove obsolete IRQ_TYPE_*
sound: dmasound_atari: Remove obsolete IRQ_TYPE_SLOW
video: atafb: Remove obsolete IRQ_TYPE_PRIO
parport: parport_atari: Remove obsolete IRQ_TYPE_SLOW
net: atarilance: Remove obsolete IRQ_TYPE_PRIO
m68k/atari: Remove obsolete keyboard_tasklet scheduling
m68k/mac: Fix scsi_type for Mac LC and similar models
m68k: Switch to asm-generic/futex.h
m68k/mvme147: config.c - Remove unused functions
m68k/atari: atakeyb.c - Remove some unused functions
m68k/mvme16x: rtc - Don't use module_init in non-modular code
Diffstat (limited to 'arch/m68k/include/asm/macintosh.h')
| -rw-r--r-- | arch/m68k/include/asm/macintosh.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/macintosh.h b/arch/m68k/include/asm/macintosh.h index 29c7c6c3a5f2..42235e7fbeed 100644 --- a/arch/m68k/include/asm/macintosh.h +++ b/arch/m68k/include/asm/macintosh.h @@ -55,7 +55,7 @@ struct mac_model #define MAC_SCSI_QUADRA3 4 #define MAC_SCSI_IIFX 5 #define MAC_SCSI_DUO 6 -#define MAC_SCSI_CCL 7 +#define MAC_SCSI_LC 7 #define MAC_SCSI_LATE 8 #define MAC_IDE_NONE 0 |