diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 13:12:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 13:12:39 -0700 |
| commit | 72558dde738b06cc01e16b3247a9659ca739e22d (patch) | |
| tree | 9b9ff02668fd9f948efe24bef56a23fb78f7e4d0 /include/asm-m68k | |
| parent | b91385236c00031c64b42b44db8068ad38a5ea11 (diff) | |
| parent | 769b49ce68386b21e45bb6e573b63c02020b17a1 (diff) | |
| download | kernel-crypto-72558dde738b06cc01e16b3247a9659ca739e22d.tar.gz kernel-crypto-72558dde738b06cc01e16b3247a9659ca739e22d.tar.xz kernel-crypto-72558dde738b06cc01e16b3247a9659ca739e22d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (36 commits)
ide: re-add TRM290 fix lost during ide_build_dmatable() cleanup
scc_pata: kill unused variables
sgiioc4: kill duplicate ioremap()
sgiioc4: kill useless address checks
delkin_cb: add PM support
ide: remove broken hpt34x driver
ide-floppy: remove idefloppy_floppy_t typedef
sgiioc4: remove maskproc() method
hpt366: cleanup maskproc() method
ide: mask interrupt in ide_config_drive_speed()
hpt366: fix compile warning
ide: remove unused macros from <asm-parisc/ide.h>
ide: remove M68K_IDE_SWAPW define from <asm-m68k/ide.h>
ide: remove dead <asm-arm/arch-sa1100/ide.h>
ide: fix support for IDE PCI controllers using MMIO on frv
ide-cd: remove stale comment
ide-cd: small drive type print fix
ide-cd: debug log enhancements
ide: add generic ATA/ATAPI disk driver
ide: allow device drivers to specify per-device type /proc settings
...
Diffstat (limited to 'include/asm-m68k')
| -rw-r--r-- | include/asm-m68k/ide.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/asm-m68k/ide.h b/include/asm-m68k/ide.h index 1daf6cbdd9f..b996a3c8cff 100644 --- a/include/asm-m68k/ide.h +++ b/include/asm-m68k/ide.h @@ -92,15 +92,6 @@ #define outsw_swapw(port, addr, n) raw_outsw_swapw((u16 *)port, addr, n) #endif - -/* Q40 and Atari have byteswapped IDE busses and since many interesting - * values in the identification string are text, chars and words they - * happened to be almost correct without swapping.. However *_capacity - * is needed for drives over 8 GB. RZ */ -#if defined(CONFIG_Q40) || defined(CONFIG_ATARI) -#define M68K_IDE_SWAPW (MACH_IS_Q40 || MACH_IS_ATARI) -#endif - #ifdef CONFIG_BLK_DEV_FALCON_IDE #define IDE_ARCH_LOCK |