diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-15 16:49:09 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-15 16:49:09 -0500 |
| commit | 0938e7586440ac97cedc0f5528a8684ebfa4ce43 (patch) | |
| tree | 3bdb55cb86b1ffb0bd136713eec975efae4cc651 /include | |
| parent | 7d2284b09fd967b5cad6f03c6d4a5c064f37b855 (diff) | |
| parent | 121a09e590d54be840289c6feac840453aa999d9 (diff) | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata: correct handling of TSS DVD
[libata] core checkpatch fix
[libata] pata_bf54x: checkpatch fixes
libata fixes for sparse-found problems
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ata.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/ata.h b/include/linux/ata.h index 72ab80801ef6..e672e80202a8 100644 --- a/include/linux/ata.h +++ b/include/linux/ata.h | |||
| @@ -554,8 +554,6 @@ static inline int ata_drive_40wire(const u16 *dev_id) | |||
| 554 | 554 | ||
| 555 | static inline int ata_drive_40wire_relaxed(const u16 *dev_id) | 555 | static inline int ata_drive_40wire_relaxed(const u16 *dev_id) |
| 556 | { | 556 | { |
| 557 | if (ata_id_is_sata(dev_id)) | ||
| 558 | return 0; /* SATA */ | ||
| 559 | if ((dev_id[93] & 0x2000) == 0x2000) | 557 | if ((dev_id[93] & 0x2000) == 0x2000) |
| 560 | return 0; /* 80 wire */ | 558 | return 0; /* 80 wire */ |
| 561 | return 1; | 559 | return 1; |